Fix a desync caused by ForceAltFootprint (#107)

FAForever · Nov 23, 2024 · 63718d1 · 63718d1
1 parent 8ff7188
commit 63718d1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/hooks/EntityGetFootprint.cpp b/hooks/EntityGetFootprint.cpp
diff --git a/hooks/EntityGetFootprint.hook b/hooks/EntityGetFootprint.hook
@@ -0,0 +1,10 @@
+//Moho::SSTIEntityVariableData::SSTIEntityVariableData
+0x00558823:
+    mov dword ptr [eax+0x0A4], ecx // 0x0A5 bool forceAltFootprint
+
+
+//  Moho::Entity::GetFootprint
+0x006788A5:
+    jmp @asm__GetFootprint
+    nop
+    nop
diff --git a/section/EntityGetFootprint.cpp b/section/EntityGetFootprint.cpp
@@ -14,7 +14,7 @@ int ForceAltFootprint(lua_State *L)
     void *unit = res.object;
     bool flag = lua_toboolean(L, 2);
 
-    GetField<bool>(unit, 8+0x1F9) = flag; // bool forceAltFootprint
+    GetField<bool>(unit, 8+0x11D) = flag; // bool forceAltFootprint
 
     return 0;
 }
@@ -32,7 +32,7 @@ void asm__GetFootprint()
     asm(
         "cmp   byte ptr [ecx+0x11C], 0;" //  this->sstiData.usingAltFp
         "jnz   0x006788AE;"
-        "cmp   byte ptr [ecx+0x1F9], 0;" // bool forceAltFootprint
+        "cmp   byte ptr [ecx+0x11D], 0;" // bool forceAltFootprint
         "jnz   0x006788AE;"
         "jmp   0x006788C2;"
     );