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

# Conflicts:
#	TR5Main/Scripting/GameLogicScript.cpp
This commit is contained in:
MontyTRC89 2021-06-23 05:59:25 +02:00
commit 127e142622

View file

@ -15,8 +15,6 @@ bool WarningsAsErrors = false;
GameScript::GameScript(sol::state* lua) : LuaHandler{ lua }
{
// Add constants
m_lua->new_enum<GAME_OBJECT_ID>("Object", {
{"LARA", ID_LARA}
});