From 0e4e1def81e2cfd4f06ebd82e30a8e5058de3ae0 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Sun, 12 May 2024 22:53:03 -0700 Subject: [PATCH] Update names --- tests/dGameTests/dScriptsTests/CppScriptsOld.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/dGameTests/dScriptsTests/CppScriptsOld.cpp b/tests/dGameTests/dScriptsTests/CppScriptsOld.cpp index f13d766d..45e6e39a 100644 --- a/tests/dGameTests/dScriptsTests/CppScriptsOld.cpp +++ b/tests/dGameTests/dScriptsTests/CppScriptsOld.cpp @@ -330,17 +330,17 @@ namespace { // This is in the translation unit instead of the header to prevent wierd linker errors - InvalidScript* const InvalidToReturnOld = new InvalidScript(); - std::map m_ScriptsOld; + InvalidScript* const InvalidToReturn = new InvalidScript(); + std::map m_Scripts; }; CppScripts::Script* const CppScriptsOld::GetScript(Entity* parent, const std::string& scriptName) { - auto itr = m_ScriptsOld.find(scriptName); - if (itr != m_ScriptsOld.end()) { + auto itr = m_Scripts.find(scriptName); + if (itr != m_Scripts.end()) { return itr->second; } - CppScripts::Script* script = InvalidToReturnOld; + CppScripts::Script* script = InvalidToReturn; //VE / AG: if (scriptName == "scripts\\ai\\AG\\L_AG_SHIP_PLAYER_DEATH_TRIGGER.lua") @@ -977,15 +977,15 @@ CppScripts::Script* const CppScriptsOld::GetScript(Entity* parent, const std::st // handle invalid script reporting if the path is greater than zero and it's not an ignored script // information not really needed for sys admins but is for developers - else if (script == InvalidToReturnOld) { + else if (script == InvalidToReturn) { if ((scriptName.length() > 0) && !((scriptName == "scripts\\02_server\\Enemy\\General\\L_SUSPEND_LUA_AI.lua") || (scriptName == "scripts\\02_server\\Enemy\\General\\L_BASE_ENEMY_SPIDERLING.lua") || - (scriptName == "scripts\\ai\\FV\\L_ACT_NINJA_STUDENT.lua") || + (scriptName =="scripts\\ai\\FV\\L_ACT_NINJA_STUDENT.lua") || (scriptName == "scripts\\ai\\WILD\\L_WILD_GF_FROG.lua") || (scriptName == "scripts\\empty.lua") )) LOG_DEBUG("LOT %i attempted to load CppScript for '%s', but returned InvalidScript.", parent->GetLOT(), scriptName.c_str()); } - m_ScriptsOld[scriptName] = script; + m_Scripts[scriptName] = script; return script; }