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

Shorten TEN calls if they haven't yet been shortened; reset this flag when scripts are reset. Fixes #735

Browse source
This commit is contained in:
hispidence 2022-09-13 20:37:31 +01:00
parent f5da03db9f
commit 27b1ad43f9
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TombEngine/Scripting/Internal/TEN/Logic/LogicHandler.cpp
View file

@ -290,6 +290,8 @@ void LogicHandler::ResetScripts(bool clearGameVars)
m_handler.ResetGlobals();
m_shortenedCalls = false;
m_handler.GetState()->collect_garbage();
}
@ -604,7 +606,12 @@ void LogicHandler::ShortenTENCalls()
void LogicHandler::ExecuteScriptFile(const std::string & luaFilename)
{
ShortenTENCalls();
if (!m_shortenedCalls)
{
ShortenTENCalls();
m_shortenedCalls = true;
}
m_handler.ExecuteScript(luaFilename);
}

3
TombEngine/Scripting/Internal/TEN/Logic/LogicHandler.h
View file

@ -57,6 +57,8 @@ private:
std::unordered_set<std::string> m_callbacksPreControl;
std::unordered_set<std::string> m_callbacksPostControl;
bool m_shortenedCalls = false;
void ResetLevelTables();
void ResetGameTables();
LuaHandler m_handler;
@ -99,5 +101,4 @@ public:
void OnControlPhase(float dt) override;
void OnSave() override;
void OnEnd() override;
};