From c552f46780276ee50e3c632a9b7dbbb9c95f28e4 Mon Sep 17 00:00:00 2001 From: Aaron Kimbrell Date: Sun, 4 Sep 2022 21:43:16 -0500 Subject: [PATCH] ignore empty.lua and empty scripts (#769) * ignore empty.lua and empty scripts and return early if it's an ignored script * return it else if logic --- dScripts/CppScripts.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dScripts/CppScripts.cpp b/dScripts/CppScripts.cpp index d313f2f9..dce77e4b 100644 --- a/dScripts/CppScripts.cpp +++ b/dScripts/CppScripts.cpp @@ -848,17 +848,13 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr else if (scriptName == "scripts\\zone\\LUPs\\WBL_generic_zone.lua") script = new WblGenericZone(); - //Ignore these scripts: - else if (scriptName == "scripts\\02_server\\Enemy\\General\\L_SUSPEND_LUA_AI.lua") - script = invalidToReturn; - else if (scriptName == "scripts\\02_server\\Enemy\\General\\L_BASE_ENEMY_SPIDERLING.lua") - script = invalidToReturn; + // 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 == invalidToReturn) { - if (scriptName.length() > 0) - Game::logger->LogDebug("CppScripts", "Attempted to load CppScript for '%s', but returned InvalidScript.", scriptName.c_str()); - // information not really needed for sys admins but is for developers - - 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\\empty.lua") + )) Game::logger->LogDebug("CppScripts", "LOT %i attempted to load CppScript for '%s', but returned InvalidScript.", parent->GetLOT(), scriptName.c_str()); } m_Scripts[scriptName] = script;