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

Make m_levelFuncs an unordered_set, as these seem to be the proper structure to use when the key IS the value.

Browse source 
Make all GameScript maps unordered_maps, as these are supposed to be more suitable for cases where we don't need the data to be sorted.

Add default member initialisers to GameScript.
This commit is contained in:
hispidence 2021-08-06 16:47:24 +01:00
parent 7d26686836
commit dc40060a63
2 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TR5Main/Scripting/GameLogicScript.cpp
View file

@ -147,7 +147,7 @@ static void PrintString(std::string key, GameScriptPosition pos, GameScriptColor
}
GameScript::GameScript(sol::state* lua) : LuaHandler{ lua }, m_itemsMapId{}, m_itemsMapName{}, m_meshesMapName{}
GameScript::GameScript(sol::state* lua) : LuaHandler{ lua }
{
/*** Ambience and music
@section Music
@ -367,7 +367,7 @@ bool GameScript::SetLevelFunc(sol::table tab, std::string const& luaName, sol::o
tab.raw_set(luaName, value);
break;
case sol::type::function:
m_levelFuncs[luaName];
m_levelFuncs.insert(luaName);
tab.raw_set(luaName, value);
break;
default:
@ -589,7 +589,7 @@ template void GameScript::SetVariables<float>(std::map<std::string, float>& loca
template void GameScript::SetVariables<std::string>(std::map<std::string, std::string>& locals, std::map<std::string, std::string>& globals);
template <typename T, typename Stored>
std::unique_ptr<T> GetTByName(std::string const & type, std::string const& name, std::map<std::string, Stored> const & map)
std::unique_ptr<T> GetTByName(std::string const & type, std::string const& name, std::unordered_map<std::string, Stored> const & map)
{
ScriptAssert(map.find(name) != map.end(), std::string{ type + " name not found: " + name }, ERROR_MODE::TERMINATE);
return std::make_unique<T>(map.at(name), false);