Standardized warning messages of terminate_this_script and terminate_… (

#174)
cleolibrary · Aug 2, 2024 · 6aeb737 · 6aeb737
1 parent 57306e1
commit 6aeb737
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/source/CCustomOpcodeSystem.cpp b/source/CCustomOpcodeSystem.cpp
@@ -863,11 +863,11 @@ namespace CLEO
 		CCustomScript *cs = reinterpret_cast<CCustomScript *>(thread);
 		if (thread->IsMission() || !cs->IsCustom())
 		{
-			LOG_WARNING(0, "Incorrect usage of opcode [0A93] in script %s", ((CCustomScript*)thread)->GetInfoStr().c_str());
-
-			return OR_CONTINUE;
+			LOG_WARNING(0, "Incorrect usage of opcode [0A93] in script %s. Use [004E] instead.", ((CCustomScript*)thread)->GetInfoStr().c_str());
+			return OR_CONTINUE; // legacy behavior
 		}
-		GetInstance().ScriptEngine.RemoveCustomScript(cs);
+
+		GetInstance().ScriptEngine.RemoveScript(thread);
 		return OR_INTERRUPT;
 	}
 

diff --git a/source/CScriptEngine.cpp b/source/CScriptEngine.cpp
@@ -313,16 +313,6 @@ namespace CLEO
 
     extern "C" void __stdcall opcode_004E(CCustomScript *pScript) // terminate_this_script
     {
-        if (pScript->IsCustom())
-        {
-            if (pScript->IsMission())
-                *MissionLoaded = false;
-            else
-            {
-                TRACE("Incorrect usage of opcode [004E] in script %s.", pScript->GetName().c_str());
-            }
-        }
-
         GetInstance().ScriptEngine.RemoveScript(pScript);
     }
 
@@ -1369,17 +1359,18 @@ namespace CLEO
 
     void CScriptEngine::RemoveScript(CRunningScript* thread)
     {
-        if (!thread->IsCustom())
+        if (thread->IsMission()) *MissionLoaded = false;
+
+        if (thread->IsCustom())
+        {
+            RemoveCustomScript((CCustomScript*)thread);
+        }
+        else // native script
         {
-            if (thread->IsMission()) *MissionLoaded = false;
             RemoveScriptFromQueue(thread, activeThreadQueue);
             AddScriptToQueue(thread, inactiveThreadQueue);
             StopScript(thread);
         }
-        else
-        {
-            RemoveCustomScript((CCustomScript*)thread);
-        }
     }
 
     void CScriptEngine::RemoveCustomScript(CCustomScript *cs)
@@ -1397,7 +1388,7 @@ namespace CLEO
 		}
 		for (auto childThread : cs->childThreads)
 		{
-			CScriptEngine::RemoveCustomScript(childThread);
+			CScriptEngine::RemoveScript(childThread);
 		}
         if (cs == CustomMission)
         {

diff --git a/source/CScriptEngine.h b/source/CScriptEngine.h
@@ -142,7 +142,6 @@ namespace CLEO
         bool IsValidScriptPtr(const CRunningScript*) const; // leads to any script? (regular or custom)
         void AddCustomScript(CCustomScript*);
         void RemoveScript(CRunningScript*); // native or custom
-        void RemoveCustomScript(CCustomScript*);
         void RemoveAllCustomScripts();
         void UnregisterAllScripts();
         void ReregisterAllScripts();
@@ -151,6 +150,9 @@ namespace CLEO
 
         inline CCustomScript* GetCustomMission() { return CustomMission; }
         inline size_t WorkingScriptsCount() { return CustomScripts.size(); }
+
+    private:
+        void RemoveCustomScript(CCustomScript*);
     };
 
     extern void(__thiscall * AddScriptToQueue)(CRunningScript *, CRunningScript **queue);