jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2024-12-29 15:23:02 +05:00
Code Issues Projects Releases Packages Wiki Activity Actions

SilentPatchIII: Fixup the MSVC inline assembly statements

Browse source 
Some of them use the deference operator incorrectly (also clean them
up in general)
This commit is contained in:
Echo J 2024-11-04 17:14:10 +02:00
parent 47e7ab6b1f
commit 602ac27b38
1 changed files with 61 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
SilentPatchIII/SilentPatchIII.cpp
View file

@ -194,37 +194,37 @@ void ResetMousePos()
orgConstructRenderList(); orgConstructRenderList();
} }
void __declspec(naked) M16StatsFix() __declspec(naked) void M16StatsFix()
{ {
_asm _asm
{ {
add eax, 34h add eax, 0x34
add ebx, 34h add ebx, 0x34
mov ecx, [InstantHitsFiredByPlayer] mov ecx, InstantHitsFiredByPlayer
inc [ecx] inc dword ptr [ecx]
retn ret
} }
} }
void __declspec(naked) HeadlightsFix() static const float fMinusOne = -1.0f;
__declspec(naked) void HeadlightsFix()
{ {
static const float fMinusOne = -1.0f;
_asm _asm
{ {
fld [esp+708h-690h] fld dword ptr [esp+0x708-0x690]
fcomp fMinusOne fcomp fMinusOne
fnstsw ax fnstsw ax
and ah, 5 and ah, 5
cmp ah, 1 cmp ah, 1
jnz HeadlightsFix_DontLimit jnz HeadlightsFix_DontLimit
fld fMinusOne fld fMinusOne
fstp [esp+708h-690h] fstp dword ptr [esp+0x708-0x690]
HeadlightsFix_DontLimit: HeadlightsFix_DontLimit:
fld [esp+708h-690h] fld dword ptr [esp+0x708-0x690]
fabs fabs
fld st fld st
jmp [HeadlightsFix_JumpBack] jmp HeadlightsFix_JumpBack
} }
} }
@ -312,68 +312,68 @@ float FixedRefValue()
return 1.0f; return 1.0f;
} }
void __declspec(naked) SubtitlesShadowFix() __declspec(naked) void SubtitlesShadowFix()
{ {
_asm _asm
{ {
push eax push eax
call Recalculate call Recalculate
fadd [esp+50h+8] fadd dword ptr [esp+0x50+8]
fadd [fShadowYSize] fadd fShadowYSize
jmp SubtitlesShadowFix_JumpBack jmp SubtitlesShadowFix_JumpBack
} }
} }
void __declspec(naked) III_SensResetFix() __declspec(naked) void III_SensResetFix()
{ {
_asm _asm
{ {
mov ecx, 3A76h mov ecx, 0x3A76
mov edi, ebp mov edi, ebp
fld dword ptr [ebp+194h] fld dword ptr [ebp+0x194]
fld dword ptr [ebp+198h] fld dword ptr [ebp+0x198]
rep stosd rep stosd
fstp dword ptr [ebp+198h] fstp dword ptr [ebp+0x198]
fstp dword ptr [ebp+194h] fstp dword ptr [ebp+0x194]
retn ret
} }
} }
static void* RadarBoundsCheckCoordBlip_JumpBack = AddressByVersion<void*>(0x4A55B8, 0x4A56A8, 0x4A5638); static void* RadarBoundsCheckCoordBlip_JumpBack = AddressByVersion<void*>(0x4A55B8, 0x4A56A8, 0x4A5638);
static void* RadarBoundsCheckCoordBlip_Count = AddressByVersion<void*>(0x4A55AF, 0x4A569F, 0x4A562F); static void* RadarBoundsCheckCoordBlip_Count = AddressByVersion<void*>(0x4A55AF, 0x4A569F, 0x4A562F);
void __declspec(naked) RadarBoundsCheckCoordBlip() __declspec(naked) void RadarBoundsCheckCoordBlip()
{ {
_asm _asm
{ {
mov edx, dword ptr [RadarBoundsCheckCoordBlip_Count] mov edx, RadarBoundsCheckCoordBlip_Count
cmp cl, byte ptr [edx] cmp cl, byte ptr [edx]
jnb OutOfBounds jnb OutOfBounds
mov edx, ecx mov edx, ecx
mov eax, [esp+4] mov eax, [esp+4]
jmp RadarBoundsCheckCoordBlip_JumpBack jmp RadarBoundsCheckCoordBlip_JumpBack
OutOfBounds: OutOfBounds:
or eax, -1 or eax, -1
fcompp fcompp
retn ret
} }
} }
static void* RadarBoundsCheckEntityBlip_JumpBack = AddressByVersion<void*>(0x4A565E, 0x4A574E, 0x4A56DE); static void* RadarBoundsCheckEntityBlip_JumpBack = AddressByVersion<void*>(0x4A565E, 0x4A574E, 0x4A56DE);
void __declspec(naked) RadarBoundsCheckEntityBlip() __declspec(naked) void RadarBoundsCheckEntityBlip()
{ {
_asm _asm
{ {
mov edx, dword ptr [RadarBoundsCheckCoordBlip_Count] mov edx, RadarBoundsCheckCoordBlip_Count
cmp cl, byte ptr [edx] cmp cl, byte ptr [edx]
jnb OutOfBounds jnb OutOfBounds
mov edx, ecx mov edx, ecx
mov eax, [esp+4] mov eax, [esp+4]
jmp RadarBoundsCheckEntityBlip_JumpBack jmp RadarBoundsCheckEntityBlip_JumpBack
OutOfBounds: OutOfBounds:
or eax, -1 or eax, -1
retn ret
} }
} }
@ -411,11 +411,12 @@ unsigned int __cdecl AutoPilotTimerCalculation_III(unsigned int nTimer, int nSca
return nTimer - static_cast<unsigned int>(nScaleFactor * fScaleCoef); return nTimer - static_cast<unsigned int>(nScaleFactor * fScaleCoef);
} }
void __declspec(naked) AutoPilotTimerFix_III() __declspec(naked) void AutoPilotTimerFix_III()
{ {
_asm { _asm
push dword ptr[esp + 0x4] {
push dword ptr[ebx + 0x10] push dword ptr [esp + 0x4]
push dword ptr [ebx + 0x10]
push eax push eax
call AutoPilotTimerCalculation_III call AutoPilotTimerCalculation_III
add esp, 0xC add esp, 0xC
@ -424,7 +425,7 @@ void __declspec(naked) AutoPilotTimerFix_III()
pop ebp pop ebp
pop esi pop esi
pop ebx pop ebx
retn 4 ret 4
} }
} }
@ -576,22 +577,22 @@ namespace SirenSwitchingFix
// ============= Fixed vehicles exploding twice if the driver leaves the car while it's exploding ============= // ============= Fixed vehicles exploding twice if the driver leaves the car while it's exploding =============
namespace RemoveDriverStatusFix namespace RemoveDriverStatusFix
{ {
__declspec(naked) void RemoveDriver_SetStatus() __declspec(naked) static void RemoveDriver_SetStatus()
{ {
// if (m_nStatus != STATUS_WRECKED) // if (m_nStatus != STATUS_WRECKED)
// m_nStatus = STATUS_ABANDONED; // m_nStatus = STATUS_ABANDONED;
_asm _asm
{ {
mov ah, [ecx+50h] mov ah, [ecx+0x50]
mov al, ah mov al, ah
and ah, 0F8h and ah, 0xF8
cmp ah, 28h cmp ah, 0x28
je DontSetStatus je DontSetStatus
and al, 7 and al, 7
or al, 20h or al, 0x20
DontSetStatus: DontSetStatus:
retn ret
} }
} }
} }
@ -623,17 +624,17 @@ namespace EvasiveDiveFix
return CGeneral::LimitRadianAngle(angle); return CGeneral::LimitRadianAngle(angle);
} }
__declspec(naked) void CalculateAngle_Hook() __declspec(naked) static void CalculateAngle_Hook()
{ {
_asm _asm
{ {
push dword ptr [esi+7Ch] push dword ptr [esi+0x7C]
push dword ptr [esi+78h] push dword ptr [esi+0x78]
call CalculateAngle call CalculateAngle
add esp, 8 add esp, 8
mov ecx, ebp mov ecx, ebp
retn ret
} }
} }
} }
@ -651,7 +652,7 @@ namespace NullTerminatedLines
{ {
mov eax, [esp+4] mov eax, [esp+4]
mov byte ptr [eax+ecx], 0 mov byte ptr [eax+ecx], 0
jmp [orgSscanf_LoadPath] jmp orgSscanf_LoadPath
} }
} }
@ -662,7 +663,7 @@ namespace NullTerminatedLines
{ {
mov eax, [esp+4] mov eax, [esp+4]
mov byte ptr [eax+ecx], 0 mov byte ptr [eax+ecx], 0
jmp [orgSscanf1] jmp orgSscanf1
} }
} }
@ -670,12 +671,12 @@ namespace NullTerminatedLines
{ {
_asm _asm
{ {
mov ecx, [gString] mov ecx, gString
mov byte ptr [ecx+edx], 0 mov byte ptr [ecx+edx], 0
mov ecx, [esi] mov ecx, [esi]
inc ebp inc ebp
add ecx, [esp+0ACh-98h] add ecx, [esp+0xAC-0x98]
retn ret
} }
} }
} }
@ -705,14 +706,14 @@ namespace DodoKeyboardControls
{ {
_asm _asm
{ {
call [orgFindPlayerVehicle] call orgFindPlayerVehicle
mov ecx, [bAllDodosCheat] mov ecx, bAllDodosCheat
cmp byte ptr [ecx], 0 cmp byte ptr [ecx], 0
je CheatDisabled je CheatDisabled
mov byte ptr [esp+1Ch-14h], 1 mov byte ptr [esp+0x1C-0x14], 1
CheatDisabled: CheatDisabled:
retn ret
} }
} }
} }
@ -768,11 +769,11 @@ namespace GenerateNewPickup_ReuseObjectFix
static void* pPickupObject; static void* pPickupObject;
static void (*orgGiveUsAPickUpObject)(int); static void (*orgGiveUsAPickUpObject)(int);
__declspec(naked) void GiveUsAPickUpObject_CleanUpObject() __declspec(naked) static void GiveUsAPickUpObject_CleanUpObject()
{ {
_asm _asm
{ {
mov eax, [pPickupObject] mov eax, pPickupObject
add eax, ebp add eax, ebp
mov eax, [eax] mov eax, [eax]
test eax, eax test eax, eax
@ -781,7 +782,7 @@ namespace GenerateNewPickup_ReuseObjectFix
mov edi, eax mov edi, eax
push edi push edi
call [WorldRemove] call WorldRemove
add esp, 4 add esp, 4
// Call dtor // Call dtor
@ -793,7 +794,7 @@ namespace GenerateNewPickup_ReuseObjectFix
pop edi pop edi
NoPickup: NoPickup:
jmp [orgGiveUsAPickUpObject] jmp orgGiveUsAPickUpObject
} }
} }
} }
@ -2499,4 +2500,4 @@ extern "C" __declspec(dllexport)
uint32_t GetBuildNumber() uint32_t GetBuildNumber()
{ {
return (SILENTPATCH_REVISION_ID << 8) | SILENTPATCH_BUILD_ID; return (SILENTPATCH_REVISION_ID << 8) | SILENTPATCH_BUILD_ID;
} }