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

Uncomment ExecuteFunction and make it take a const ref.

Browse source 
Make «Add/Remove»LuaName return a bool for future error checking, and pass them via lambdas to GameScriptItemInfo, allowing it to call them whenever an object is added or removed (they would not have access to the m_itemsMapName otherwise).
This commit is contained in:
hispidence 2021-07-17 22:26:07 +01:00
parent d8a060ed52
commit 87ebe31767
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
TR5Main/Scripting/GameLogicScript.cpp
View file

@ -55,6 +55,16 @@ GameScript::GameScript(sol::state* lua) : LuaHandler{ lua }
m_lua->safe_script("InvItemMeta = nil");
GameScriptItemInfo::Register(m_lua);
auto addLuaName = [this](std::string const& str, short num)
{
return m_itemsMapName.insert(std::pair<std::string, short>(str, num)).second;
};
auto removeLuaName = [this](std::string const& str)
{
return m_itemsMapName.erase(str);
};
GameScriptItemInfo::SetNameCallbacks(addLuaName, removeLuaName);
GameScriptPosition::Register(m_lua);
GameScriptRotation::Register(m_lua);
@ -80,9 +90,14 @@ void GameScript::AddLuaId(int luaId, short itemNumber)
m_itemsMapId.insert(std::pair<int, short>(luaId, itemNumber));
}
void GameScript::AddLuaName(std::string luaName, short itemNumber)
bool GameScript::RemoveLuaName(std::string const & luaName)
{
m_itemsMapName.insert(std::pair<std::string, short>(luaName, itemNumber));
return m_itemsMapName.erase(luaName);
}
bool GameScript::AddLuaName(std::string const & luaName, short itemNumber)
{
return m_itemsMapName.insert(std::pair<std::string, short>(luaName, itemNumber)).second;
}
void GameScript::FreeLevelScripts()
@ -427,16 +442,16 @@ void LuaVariables::SetVariable(std::string key, sol::object value)
}
}
void GameScript::ExecuteFunction(std::string name)
void GameScript::ExecuteFunction(std::string const & name)
{
/*sol::protected_function func = (*m_lua)[name.c_str()];
sol::protected_function func = (*m_lua)[name.c_str()];
auto r = func();
if (WarningsAsErrors && !r.valid())
{
sol::error err = r;
std::cerr << "An error occurred: " << err.what() << "\n";
throw std::runtime_error(err.what());
}*/
}
}
static void doCallback(sol::protected_function const & func) {