Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-30 00:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'NewLuaScripting' of https://github.com/MontyTRC89/TR5Main into NewLuaScripting

Browse source 
# Conflicts:
#	TR5Main/Scripting/GameLogicScript.cpp
This commit is contained in:
MontyTRC89 2021-06-29 05:03:57 +02:00
commit aaee0e833a
5 changed files with 101 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TR5Main/Scripting/GameLogicScript.cpp
View file

@ -11,6 +11,7 @@
#include <Game/tomb4fx.h>
#include <Game/effect2.h>
#include <Game/pickup.h>
#include "GameScriptItemInfo.h"
extern GameFlow* g_GameFlow;
GameScript* g_GameScript;
@ -18,6 +19,7 @@ bool WarningsAsErrors = false;
GameScript::GameScript(sol::state* lua) : LuaHandler{ lua }
{
GameScriptItemInfo::Register(m_lua);
m_lua->new_enum<GAME_OBJECT_ID>("Object", {
{"LARA", ID_LARA}
});