From e99263d69770cbcccecab4a3b5a7ca4f25875809 Mon Sep 17 00:00:00 2001
From: xensik <8714336+xensik@users.noreply.github.com>
Date: Sat, 15 May 2021 20:12:33 +0200
Subject: [PATCH] add missing childthreads

---
 src/h1/xsk/decompiler.cpp  | 46 ++++++++++++++++++++++++++++++++++++++
 src/h2/xsk/decompiler.cpp  | 46 ++++++++++++++++++++++++++++++++++++++
 src/iw5/xsk/decompiler.cpp | 46 ++++++++++++++++++++++++++++++++++++++
 src/iw6/xsk/decompiler.cpp | 46 ++++++++++++++++++++++++++++++++++++++
 src/iw7/xsk/decompiler.cpp | 46 ++++++++++++++++++++++++++++++++++++++
 src/s1/xsk/decompiler.cpp  | 46 ++++++++++++++++++++++++++++++++++++++
 src/s2/xsk/decompiler.cpp  | 46 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 322 insertions(+)

diff --git a/src/h1/xsk/decompiler.cpp b/src/h1/xsk/decompiler.cpp
index 617535b..edd7430 100644
--- a/src/h1/xsk/decompiler.cpp
+++ b/src/h1/xsk/decompiler.cpp
@@ -658,6 +658,28 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarChildThreadCall:
+        {
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+           auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto obj = gsc::expr_ptr(std::make_unique<gsc::node>());
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFarMethodThreadCall:
         {
             auto obj = gsc::expr_ptr(std::move(stack_.top()));
@@ -682,6 +704,30 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarMethodChildThreadCall:
+        {
+            auto obj = gsc::expr_ptr(std::move(stack_.top()));
+            stack_.pop();
+            loc = obj.as_node->loc;
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+            auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFunctionCallPointer:
         {
             auto args = std::make_unique<gsc::node_expr_arguments>(loc);
diff --git a/src/h2/xsk/decompiler.cpp b/src/h2/xsk/decompiler.cpp
index ee684d0..1e8f418 100644
--- a/src/h2/xsk/decompiler.cpp
+++ b/src/h2/xsk/decompiler.cpp
@@ -658,6 +658,28 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarChildThreadCall:
+        {
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+           auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto obj = gsc::expr_ptr(std::make_unique<gsc::node>());
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFarMethodThreadCall:
         {
             auto obj = gsc::expr_ptr(std::move(stack_.top()));
@@ -682,6 +704,30 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarMethodChildThreadCall:
+        {
+            auto obj = gsc::expr_ptr(std::move(stack_.top()));
+            stack_.pop();
+            loc = obj.as_node->loc;
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+            auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFunctionCallPointer:
         {
             auto args = std::make_unique<gsc::node_expr_arguments>(loc);
diff --git a/src/iw5/xsk/decompiler.cpp b/src/iw5/xsk/decompiler.cpp
index b2b0ba1..134d475 100644
--- a/src/iw5/xsk/decompiler.cpp
+++ b/src/iw5/xsk/decompiler.cpp
@@ -658,6 +658,28 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarChildThreadCall:
+        {
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+           auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto obj = gsc::expr_ptr(std::make_unique<gsc::node>());
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFarMethodThreadCall:
         {
             auto obj = gsc::expr_ptr(std::move(stack_.top()));
@@ -682,6 +704,30 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarMethodChildThreadCall:
+        {
+            auto obj = gsc::expr_ptr(std::move(stack_.top()));
+            stack_.pop();
+            loc = obj.as_node->loc;
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+            auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFunctionCallPointer:
         {
             auto args = std::make_unique<gsc::node_expr_arguments>(loc);
diff --git a/src/iw6/xsk/decompiler.cpp b/src/iw6/xsk/decompiler.cpp
index a17e2f3..875054d 100644
--- a/src/iw6/xsk/decompiler.cpp
+++ b/src/iw6/xsk/decompiler.cpp
@@ -658,6 +658,28 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarChildThreadCall:
+        {
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+           auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto obj = gsc::expr_ptr(std::make_unique<gsc::node>());
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFarMethodThreadCall:
         {
             auto obj = gsc::expr_ptr(std::move(stack_.top()));
@@ -682,6 +704,30 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarMethodChildThreadCall:
+        {
+            auto obj = gsc::expr_ptr(std::move(stack_.top()));
+            stack_.pop();
+            loc = obj.as_node->loc;
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+            auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFunctionCallPointer:
         {
             auto args = std::make_unique<gsc::node_expr_arguments>(loc);
diff --git a/src/iw7/xsk/decompiler.cpp b/src/iw7/xsk/decompiler.cpp
index 3f5f695..283227a 100644
--- a/src/iw7/xsk/decompiler.cpp
+++ b/src/iw7/xsk/decompiler.cpp
@@ -658,6 +658,28 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarChildThreadCall:
+        {
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+           auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto obj = gsc::expr_ptr(std::make_unique<gsc::node>());
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFarMethodThreadCall:
         {
             auto obj = gsc::expr_ptr(std::move(stack_.top()));
@@ -682,6 +704,30 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarMethodChildThreadCall:
+        {
+            auto obj = gsc::expr_ptr(std::move(stack_.top()));
+            stack_.pop();
+            loc = obj.as_node->loc;
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+            auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFunctionCallPointer:
         {
             auto args = std::make_unique<gsc::node_expr_arguments>(loc);
diff --git a/src/s1/xsk/decompiler.cpp b/src/s1/xsk/decompiler.cpp
index eb8eb84..906a883 100644
--- a/src/s1/xsk/decompiler.cpp
+++ b/src/s1/xsk/decompiler.cpp
@@ -658,6 +658,28 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarChildThreadCall:
+        {
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+           auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto obj = gsc::expr_ptr(std::make_unique<gsc::node>());
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFarMethodThreadCall:
         {
             auto obj = gsc::expr_ptr(std::move(stack_.top()));
@@ -682,6 +704,30 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarMethodChildThreadCall:
+        {
+            auto obj = gsc::expr_ptr(std::move(stack_.top()));
+            stack_.pop();
+            loc = obj.as_node->loc;
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+            auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFunctionCallPointer:
         {
             auto args = std::make_unique<gsc::node_expr_arguments>(loc);
diff --git a/src/s2/xsk/decompiler.cpp b/src/s2/xsk/decompiler.cpp
index 89298b7..4226e89 100644
--- a/src/s2/xsk/decompiler.cpp
+++ b/src/s2/xsk/decompiler.cpp
@@ -658,6 +658,28 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarChildThreadCall:
+        {
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+           auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto obj = gsc::expr_ptr(std::make_unique<gsc::node>());
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFarMethodThreadCall:
         {
             auto obj = gsc::expr_ptr(std::move(stack_.top()));
@@ -682,6 +704,30 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
             stack_.push(std::move(expr));
         }
         break;
+        case opcode::OP_ScriptFarMethodChildThreadCall:
+        {
+            auto obj = gsc::expr_ptr(std::move(stack_.top()));
+            stack_.pop();
+            loc = obj.as_node->loc;
+            auto args = std::make_unique<gsc::node_expr_arguments>(loc);
+            auto name = std::make_unique<gsc::node_name>(loc, inst->data[2]);
+            auto file = std::make_unique<gsc::node_file>(loc, utils::string::backslash(inst->data[1]));
+
+            auto argnum = std::stoul(inst->data[0]);
+
+            for (size_t i = argnum; i > 0; i--)
+            {
+                auto var = std::move(stack_.top());
+                stack_.pop();
+                loc = var->loc;
+                args->list.push_back(std::move(var));
+            }
+
+            auto func = gsc::expr_call_type_ptr(std::make_unique<gsc::node_expr_call_function>(loc, std::move(file), std::move(name), std::move(args)));
+            auto expr = std::make_unique<gsc::node_expr_call>(loc, false, true, std::move(obj) ,std::move(func));
+            stack_.push(std::move(expr));
+        }
+        break;
         case opcode::OP_ScriptFunctionCallPointer:
         {
             auto args = std::make_unique<gsc::node_expr_arguments>(loc);