Inline asm hooks 1/2

FileEX · Oct 28, 2024 · f56749c · f56749c
1 parent e92702c
commit f56749c
Show file tree

Hide file tree

Showing 7 changed files with 697 additions and 938 deletions.
diff --git a/Client/game_sa/CHandlingManagerSA.cpp b/Client/game_sa/CHandlingManagerSA.cpp
@@ -103,20 +103,14 @@ __declspec(noinline) void DumpHandlingData(tHandlingDataSA* pData)
 
 static __declspec(naked) void Hook_Calculate()
 {
-    tHandlingDataSA* pData;
-    DWORD dwHandlingData;
     _asm
     {
-        mov         eax, [esp+4]
-        mov         dwHandlingData, eax
-    }
-
-    pData = reinterpret_cast<tHandlingDataSA*>(dwHandlingData);
-    DumpHandlingData(pData);
+        mov eax, [esp+4]
+        push eax
+        call DumpHandlingData
+        add esp, 4
 
-    _asm
-    {
-        ret         4
+        ret 4
     }
 }
 

diff --git a/Client/game_sa/CTaskManagementSystemSA.cpp b/Client/game_sa/CTaskManagementSystemSA.cpp
@@ -265,20 +265,16 @@ __declspec(noinline) void OnMY_Task_Operator_Delete(CTaskSAInterface* pTaskInter
 void _declspec(naked) HOOK_CTask_Operator_Delete()
 {
     _asm
-        {
-        mov     eax, [esp+4]
-        mov     pTempTaskInterface, eax
+    {
+        mov eax, [esp+4]
+        mov pTempTaskInterface, eax
 
         pushad
-        }
-
-    OnMY_Task_Operator_Delete(pTempTaskInterface);
-
-    // Continue on our merry way....
-    _asm
-    {
+        push pTempTaskInterface
+        call OnMY_Task_Operator_Delete
         popad
 
+        // Continue on our merry way....
         mov     eax, 0xB744A8
         mov     ecx, dword ptr [eax]
         mov     eax, FUNC_CTask_Operator_Delete

diff --git a/Client/game_sa/CWorldSA.cpp b/Client/game_sa/CWorldSA.cpp
@@ -91,43 +91,49 @@ DWORD CONTINUE_CWorld_FallenCars = 0x00565E8A;
 
 void _declspec(naked) HOOK_FallenPeds()
 {
-    if (pGame && pGame->IsUnderWorldWarpEnabled())
-    {
-        _asm
-        {
-            sub esp, 2Ch
-            push ebx
-            mov ebx, ds:0B74490h
-            jmp CONTINUE_CWorld_FallenPeds
-        }
-    }
-    else
+    _asm
     {
-        _asm
-        {
-            ret
-        }
+        // if (pGame)
+        mov eax, pGame
+        test eax, eax
+        jz skip
+
+        // if (pGame->IsUnderWorldWarpEnabled())
+        call dword ptr [eax+80h]
+        test al, al
+        jz skip
+
+        sub esp, 2Ch
+        push ebx
+        mov ebx, ds:0B74490h
+        jmp CONTINUE_CWorld_FallenPeds
+
+        skip:
+        ret
     }
 }
 
 void _declspec(naked) HOOK_FallenCars()
 {
-    if (pGame && pGame->IsUnderWorldWarpEnabled())
-    {
-        _asm
-        {
-            sub esp, 2Ch
-            push ebx
-            mov ebx, ds:0B74494h
-            jmp CONTINUE_CWorld_FallenCars
-        }
-    }
-    else
+    _asm
     {
-        _asm
-        {
-            ret
-        }
+        // if (pGame)
+        mov eax, pGame
+        test eax, eax
+        jz skip
+
+        // if (pGame->IsUnderWorldWarpEnabled())
+        call dword ptr [eax+80h]
+        test al, al
+        jz skip
+
+        sub esp, 2Ch
+        push ebx
+        mov ebx, ds:0B74494h
+        jmp CONTINUE_CWorld_FallenCars
+
+        skip:
+        ret
     }
 }