Introduce compatibility with the Python-based patcher (#100)

FAForever · Nov 12, 2024 · 64368d9 · 64368d9
1 parent dc0bf00
commit 64368d9
Show file tree

Hide file tree

Showing 48 changed files with 3,430 additions and 3,543 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,8 @@ section.cpp
 *.til
 *.nam
 
-.vscode
+.vscode
+
+section.ld
+section/main.cpp
+section/main.cxx
diff --git a/config.txt b/config.txt
diff --git a/hooks/HFAExtLoad.cpp b/hooks/HFAExtLoad.cpp
@@ -1,13 +1,8 @@
 #include "../define.h"
 asm(
-  ".section h0; .set h0,0xA8EF63;"
-  "JMP "QU(FAExtLoad)";"
-
-#ifdef STARTUP
   ".section h1; .set h1,0x45A926;"
   "push eax;"
-  "call "QU(STARTUP)";"
+  "call "QU(InitCtors)";"
   "pop eax;"
   "ret 8;"
-#endif
 );
diff --git a/hooks/LuaFuncRegs.cpp b/hooks/LuaFuncRegs.cpp
diff --git a/section/include/CObject.h → include/CObject.h b/section/include/CObject.h → include/CObject.h
@@ -45,7 +45,7 @@ Result<CScriptClass> GetCScriptObject(lua_State *l, int index)
 {
     using CScriptType = typename CScriptClass::Type;
     using TResult = Result<CScriptClass>;
-    void **obj = GetCObject(l, index);
+    void **obj = reinterpret_cast<void**>(GetCObject(l, index));
     if (obj == nullptr)
     {
         return TResult::Fail(s_ExpectedAGameObject);