diff --git a/TR5Main/Game/control/control.cpp b/TR5Main/Game/control/control.cpp index 8916003bf..d69f73b04 100644 --- a/TR5Main/Game/control/control.cpp +++ b/TR5Main/Game/control/control.cpp @@ -475,7 +475,7 @@ GAME_STATUS DoTitle(int index) std::string err; if (!level->ScriptFileName.empty()) { - g_GameScript->ExecuteScript(level->ScriptFileName); + g_GameScript->ExecuteScriptFile(level->ScriptFileName); g_GameScript->InitCallbacks(); g_GameScript->SetCallbackDrawString([](std::string const key, D3DCOLOR col, int x, int y, int flags) { @@ -587,7 +587,7 @@ GAME_STATUS DoLevel(int index, std::string ambient, bool loadFromSavegame) if (!level->ScriptFileName.empty()) { - g_GameScript->ExecuteScript(level->ScriptFileName); + g_GameScript->ExecuteScriptFile(level->ScriptFileName); g_GameScript->InitCallbacks(); g_GameScript->SetCallbackDrawString([](std::string const key, D3DCOLOR col, int x, int y, int flags) { diff --git a/TR5Main/Scripting/GameLogicScript.cpp b/TR5Main/Scripting/GameLogicScript.cpp index 7dda66f24..6a69d9e1c 100644 --- a/TR5Main/Scripting/GameLogicScript.cpp +++ b/TR5Main/Scripting/GameLogicScript.cpp @@ -678,6 +678,11 @@ void LuaVariables::SetVariable(sol::table tab, std::string key, sol::object valu } } +void GameScript::ExecuteScriptFile(const std::string & luaFilename) +{ + ExecuteScript(luaFilename); +} + void GameScript::ExecuteFunction(std::string const & name) { sol::protected_function func = (*m_lua)["LevelFuncs"][name.c_str()]; diff --git a/TR5Main/Scripting/GameLogicScript.h b/TR5Main/Scripting/GameLogicScript.h index 1e1465a69..ce060c657 100644 --- a/TR5Main/Scripting/GameLogicScript.h +++ b/TR5Main/Scripting/GameLogicScript.h @@ -84,6 +84,7 @@ std::optional> GetDisplayString(Displa void AssignItemsAndLara(); + void ExecuteScriptFile(const std::string& luaFilename); void ExecuteFunction(std::string const & name); void MakeItemInvisible(short id);