From 6ee676400b1bf483b7eb5e6d4fe877e585ca1623 Mon Sep 17 00:00:00 2001 From: Silent Date: Wed, 15 May 2024 17:27:54 +0200 Subject: [PATCH] Remove "Adblock" --- SilentPatch/StdAfx.h | 2 -- SilentPatchIII/SilentPatchIII.cpp | 10 ---------- SilentPatchSA/SilentPatchSA.cpp | 12 ------------ SilentPatchSA/StdAfxSA.h | 2 -- SilentPatchVC/SilentPatchVC.cpp | 10 ---------- 5 files changed, 36 deletions(-) diff --git a/SilentPatch/StdAfx.h b/SilentPatch/StdAfx.h index 2ca801a..2b41f1a 100644 --- a/SilentPatch/StdAfx.h +++ b/SilentPatch/StdAfx.h @@ -11,5 +11,3 @@ #include "Utils/MemoryMgr.h" #include "Utils/MemoryMgr.GTA.h" #include "Utils/Patterns.h" - -#define DISABLE_FLA_DONATION_WINDOW 0 diff --git a/SilentPatchIII/SilentPatchIII.cpp b/SilentPatchIII/SilentPatchIII.cpp index a4c7a5f..308be88 100644 --- a/SilentPatchIII/SilentPatchIII.cpp +++ b/SilentPatchIII/SilentPatchIII.cpp @@ -1140,16 +1140,6 @@ void Patch_III_10(uint32_t width, uint32_t height) // Fixed crash related to autopilot timing calculations InjectHook(0x4139B2, AutoPilotTimerFix_III, HookType::Jump); - - // Adblocker -#if DISABLE_FLA_DONATION_WINDOW - if ( *(DWORD*)0x582749 != 0x006A026A ) - { - Patch(0x582749, 0x006A026A); - Patch(0x58274D, 0x006A); - } -#endif - Common::Patches::DDraw_III_10( width, height, aNoDesktopMode ); } diff --git a/SilentPatchSA/SilentPatchSA.cpp b/SilentPatchSA/SilentPatchSA.cpp index d8dcb26..f5219e2 100644 --- a/SilentPatchSA/SilentPatchSA.cpp +++ b/SilentPatchSA/SilentPatchSA.cpp @@ -3681,18 +3681,6 @@ BOOL InjectDelayedPatches_10() Nop( 0x4C9239+9, 1 ); } - // Adblocker -#if DISABLE_FLA_DONATION_WINDOW - if ( moduleList.Get(L"$fastman92limitAdjuster") != nullptr ) - { - if ( *(DWORD*)0x748736 != 0xE8186A53 ) - { - Patch(0x748736, 0xE8186A53); - InjectHook(AddressByRegion_10(0x748739), 0x619B60); - } - } -#endif - if ( *(DWORD*)0x4065BB == 0x3B0BE1C1 ) { // Handle IMGs bigger than 4GB diff --git a/SilentPatchSA/StdAfxSA.h b/SilentPatchSA/StdAfxSA.h index e15ad29..c7d9948 100644 --- a/SilentPatchSA/StdAfxSA.h +++ b/SilentPatchSA/StdAfxSA.h @@ -34,8 +34,6 @@ RwObject* GetFirstObject(RwFrame* pFrame); extern unsigned char& nGameClockDays; extern unsigned char& nGameClockMonths; -#define DISABLE_FLA_DONATION_WINDOW 0 - #ifdef _DEBUG #define MEM_VALIDATORS 1 #else diff --git a/SilentPatchVC/SilentPatchVC.cpp b/SilentPatchVC/SilentPatchVC.cpp index 7f5de73..f3132a5 100644 --- a/SilentPatchVC/SilentPatchVC.cpp +++ b/SilentPatchVC/SilentPatchVC.cpp @@ -988,16 +988,6 @@ void Patch_VC_10(uint32_t width, uint32_t height) // Fixed crash related to autopilot timing calculations InjectHook(0x418FAE, AutoPilotTimerFix_VC, HookType::Jump); - - // Adblocker -#if DISABLE_FLA_DONATION_WINDOW - if ( *(DWORD*)0x5FFAE9 != 0x006A026A ) - { - Patch(0x5FFAE9, 0x006A026A); - Patch(0x5FFAED, 0x006A); - } -#endif - Common::Patches::DDraw_VC_10( width, height, aNoDesktopMode ); }