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

III: Clean up the pickup object when reusing a temporary slot

Browse source 
Fixes #21
This commit is contained in:
Silent 2024-05-08 23:12:24 +02:00
parent a535081e8a
commit 2a5f9f439c
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
1 changed files with 51 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
SilentPatchIII/SilentPatchIII.cpp
View file

@ -58,14 +58,13 @@ static void (*DrawRect)(const CRect&,const CRGBA&);
static int* InstantHitsFiredByPlayer; static int* InstantHitsFiredByPlayer;
static const void* HeadlightsFix_JumpBack; static const void* HeadlightsFix_JumpBack;
void (__stdcall *AudioResetTimers)(unsigned int);
static bool* bWantsToDrawHud; static bool* bWantsToDrawHud;
static bool* bCamCheck; static bool* bCamCheck;
static RsGlobalType* RsGlobal; static RsGlobalType* RsGlobal;
static const void* SubtitlesShadowFix_JumpBack; static const void* SubtitlesShadowFix_JumpBack;
auto WorldRemove = reinterpret_cast<void(*)(void*)>(hook::get_pattern("8A 43 50 56 24 07", -5));
static const float& ResolutionWidthMult = **AddressByVersion<float**>(0x57E956, 0x57ECA6, 0x57EBA6); static const float& ResolutionWidthMult = **AddressByVersion<float**>(0x57E956, 0x57ECA6, 0x57EBA6);
inline float GetWidthMult() inline float GetWidthMult()
{ {
@ -728,6 +727,44 @@ namespace VariableResets
} }
// ============= Clean up the pickup object when reusing a temporary slot =============
// This has been fixed in VC/SA
namespace GenerateNewPickup_ReuseObjectFix
{
static void* pPickupObject;
static void (*orgGiveUsAPickUpObject)(int);
__declspec(naked) void GiveUsAPickUpObject_CleanUpObject()
{
_asm
{
mov eax, [pPickupObject]
add eax, ebp
mov eax, [eax]
test eax, eax
jz NoPickup
push edi
mov edi, eax
push edi
call [WorldRemove]
add esp, 4
// Call dtor
mov ecx, edi
mov eax, [edi]
push 1
call dword ptr [eax]
pop edi
NoPickup:
jmp [orgGiveUsAPickUpObject]
}
}
}
void InjectDelayedPatches_III_Common( bool bHasDebugMenu, const wchar_t* wcModulePath ) void InjectDelayedPatches_III_Common( bool bHasDebugMenu, const wchar_t* wcModulePath )
{ {
using namespace Memory; using namespace Memory;
@ -912,7 +949,6 @@ void Patch_III_10(uint32_t width, uint32_t height)
using namespace Memory::DynBase; using namespace Memory::DynBase;
DrawRect = (void(*)(const CRect&,const CRGBA&))DynBaseAddress(0x51F970); DrawRect = (void(*)(const CRect&,const CRGBA&))DynBaseAddress(0x51F970);
AudioResetTimers = (void(__stdcall*)(unsigned int))DynBaseAddress(0x57CCD0);
InstantHitsFiredByPlayer = *(int**)DynBaseAddress(0x482C8F); InstantHitsFiredByPlayer = *(int**)DynBaseAddress(0x482C8F);
bWantsToDrawHud = *(bool**)DynBaseAddress(0x4A5877); bWantsToDrawHud = *(bool**)DynBaseAddress(0x4A5877);
@ -1040,7 +1076,6 @@ void Patch_III_11(uint32_t width, uint32_t height)
using namespace Memory::DynBase; using namespace Memory::DynBase;
DrawRect = (void(*)(const CRect&,const CRGBA&))DynBaseAddress(0x51FBA0); DrawRect = (void(*)(const CRect&,const CRGBA&))DynBaseAddress(0x51FBA0);
AudioResetTimers = (void(__stdcall*)(unsigned int))DynBaseAddress(0x57CCC0);
InstantHitsFiredByPlayer = *(int**)DynBaseAddress(0x482D5F); InstantHitsFiredByPlayer = *(int**)DynBaseAddress(0x482D5F);
bWantsToDrawHud = *(bool**)DynBaseAddress(0x4A5967); bWantsToDrawHud = *(bool**)DynBaseAddress(0x4A5967);
@ -1147,7 +1182,6 @@ void Patch_III_Steam(uint32_t width, uint32_t height)
using namespace Memory::DynBase; using namespace Memory::DynBase;
DrawRect = (void(*)(const CRect&,const CRGBA&))DynBaseAddress(0x51FB30); DrawRect = (void(*)(const CRect&,const CRGBA&))DynBaseAddress(0x51FB30);
AudioResetTimers = (void(__stdcall*)(unsigned int))DynBaseAddress(0x57CF20);
InstantHitsFiredByPlayer = *(int**)DynBaseAddress(0x482D5F); InstantHitsFiredByPlayer = *(int**)DynBaseAddress(0x482D5F);
bWantsToDrawHud = *(bool**)DynBaseAddress(0x4A58F7); bWantsToDrawHud = *(bool**)DynBaseAddress(0x4A58F7);
@ -1590,6 +1624,17 @@ void Patch_III_Common()
GameVariablesToReset.emplace_back(*get_pattern<int*>("7D 72 A1 ? ? ? ? 05", 2 + 1)); // LastTimeAmbulanceCreated GameVariablesToReset.emplace_back(*get_pattern<int*>("7D 72 A1 ? ? ? ? 05", 2 + 1)); // LastTimeAmbulanceCreated
GameVariablesToReset.emplace_back(*get_pattern<int*>("74 7F A1 ? ? ? ? 05", 2 + 1)); // LastTimeFireTruckCreated GameVariablesToReset.emplace_back(*get_pattern<int*>("74 7F A1 ? ? ? ? 05", 2 + 1)); // LastTimeFireTruckCreated
} }
// Clean up the pickup object when reusing a temporary slot
{
using namespace GenerateNewPickup_ReuseObjectFix;
auto give_us_a_pick_up_object = pattern("6A FF E8 ? ? ? ? 89 85").get_one();
pPickupObject = *give_us_a_pick_up_object.get<void*>(7 + 2);
InterceptCall(give_us_a_pick_up_object.get<void>(2), orgGiveUsAPickUpObject, GiveUsAPickUpObject_CleanUpObject);
}
} }
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)