custom implementation for terminate_all_scripts_with_this_name

cleolibrary · Feb 7, 2025 · 69c9089 · 69c9089
1 parent 1811b2d
commit 69c9089
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/cleo_plugins/MemoryOperations/MemoryOperations.cpp b/cleo_plugins/MemoryOperations/MemoryOperations.cpp
@@ -25,6 +25,8 @@ class MemoryOperations
         }
 
         //register opcodes
+        CLEO_RegisterOpcode(0x0459, opcode_0459); // terminate_all_scripts_with_this_name
+
         CLEO_RegisterOpcode(0x0A8C, opcode_0A8C); // write_memory
         CLEO_RegisterOpcode(0x0A8D, opcode_0A8D); // read_memory
 
@@ -218,6 +220,24 @@ class MemoryOperations
         return OR_CONTINUE;
     }
 
+    //0459=1,terminate_all_scripts_with_this_name %1s%
+    static OpcodeResult __stdcall opcode_0459(CLEO::CRunningScript* thread)
+    {
+        OPCODE_READ_PARAM_STRING(threadName);
+
+        while (true)
+        {
+            // we only want to terminate game scripts, not custom ones
+            auto found = CLEO_GetScriptByName(threadName, true, false, 0);
+            if (found == nullptr)
+                break;
+
+            CLEO_TerminateScript(found);
+        }
+
+        return OR_CONTINUE;
+    }
+
     //0A8C=4,write_memory %1d% size %2d% value %3d% virtual_protect %4d%
     static OpcodeResult __stdcall opcode_0A8C(CLEO::CRunningScript* thread)
     {

diff --git a/source/CScriptEngine.cpp b/source/CScriptEngine.cpp
@@ -1200,6 +1200,11 @@ namespace CLEO
         {
             for (auto script = *activeThreadQueue; script; script = script->GetNext())
             {
+                if (script->IsCustom()) 
+                {
+                    // skip custom scripts in the queue, they are handled separately
+                    continue;
+                }
                 if (_strnicmp(threadName, script->Name, sizeof(script->Name)) == 0)
                 {
                     if (resultIndex == 0) return script;