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

HOODLUM 1.0 US and 1.0 EU fixes - now fully compatible

Browse source
This commit is contained in:
Silent 2014-08-05 16:27:26 +02:00
parent d1ec130d7f
commit 54b381965f
2 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
SAFix/SilentPatchSA.cpp
View file

@ -70,6 +70,7 @@ auto RenderWeaponHooked = AddressByVersion<void(*)(CEntity*)>(0x732F95, 0, 0
static BOOL (*IsAlreadyRunning)(); static BOOL (*IsAlreadyRunning)();
static void (*TheScriptsLoad)(); static void (*TheScriptsLoad)();
static void (*WipeLocalVariableMemoryForMissionScript)();
static bool (*InitialiseRenderWare)(); static bool (*InitialiseRenderWare)();
static void (*ShutdownRenderWare)(); static void (*ShutdownRenderWare)();
static void (*DoSunAndMoon)(); static void (*DoSunAndMoon)();
@ -460,6 +461,8 @@ void TheScriptsLoad_BasketballFix()
void StartNewMission_BasketballFix() void StartNewMission_BasketballFix()
{ {
WipeLocalVariableMemoryForMissionScript();
if ( ScriptParams[0] == 0 ) if ( ScriptParams[0] == 0 )
BasketballFix(ScriptSpace+200000, 69000); BasketballFix(ScriptSpace+200000, 69000);
} }
@ -968,6 +971,7 @@ void __declspec(naked) HandleMoonStuffStub()
static bool bDarkVehicleThing; static bool bDarkVehicleThing;
static RpLight*& pDirect = **(RpLight***)0x5BA573; static RpLight*& pDirect = **(RpLight***)0x5BA573;
static void* DarkVehiclesFix1_JumpBack = *GetEuropean() == true ? (void*)0x756DE0 : (void*)0x756D90;
void __declspec(naked) DarkVehiclesFix1() void __declspec(naked) DarkVehiclesFix1()
{ {
_asm _asm
@ -987,8 +991,7 @@ DarkVehiclesFix1_DontAppply:
mov bDarkVehicleThing, 0 mov bDarkVehicleThing, 0
DarkVehiclesFix1_Return: DarkVehiclesFix1_Return:
mov eax, 756D90h jmp DarkVehiclesFix1_JumpBack
jmp eax
} }
} }
@ -1101,9 +1104,12 @@ BOOL InjectDelayedPatches_10()
InjectHook(0x470B05, &CRunningScript::GetDay_GymGlitch, PATCH_CALL); InjectHook(0x470B05, &CRunningScript::GetDay_GymGlitch, PATCH_CALL);
// Basketball fix // Basketball fix
WipeLocalVariableMemoryForMissionScript = (void(*)())(*(int*)0x489A71 + 0x489A70 + 5);
TheScriptsLoad = (void(*)())(*(int*)0x5D18F1 + 0x5D18F0 + 5); TheScriptsLoad = (void(*)())(*(int*)0x5D18F1 + 0x5D18F0 + 5);
InjectHook(0x5D18F0, TheScriptsLoad_BasketballFix); InjectHook(0x5D18F0, TheScriptsLoad_BasketballFix);
InjectHook(0x464BC0, StartNewMission_BasketballFix, PATCH_JUMP); // Fixed for Hoodlum
InjectHook(0x489A70, StartNewMission_BasketballFix);
InjectHook(0x4899F0, StartNewMission_BasketballFix);
} }
if ( !bSAMP && GetPrivateProfileIntW(L"SilentPatch", L"NVCShader", TRUE, wcModulePath) != FALSE ) if ( !bSAMP && GetPrivateProfileIntW(L"SilentPatch", L"NVCShader", TRUE, wcModulePath) != FALSE )
@ -1143,7 +1149,7 @@ BOOL InjectDelayedPatches_10()
if ( GetPrivateProfileIntW(L"SilentPatch", L"SkipIntroSplashes", TRUE, wcModulePath) != FALSE ) if ( GetPrivateProfileIntW(L"SilentPatch", L"SkipIntroSplashes", TRUE, wcModulePath) != FALSE )
{ {
// Skip the damn intro splash // Skip the damn intro splash
Patch<WORD>(0x748AA8, 0x3DEB); Patch<WORD>(AddressByRegion_10<DWORD>(0x748AA8), 0x3DEB);
} }
if ( GetPrivateProfileIntW(L"SilentPatch", L"SmallSteamTexts", TRUE, wcModulePath) != FALSE ) if ( GetPrivateProfileIntW(L"SilentPatch", L"SmallSteamTexts", TRUE, wcModulePath) != FALSE )
@ -1221,8 +1227,9 @@ __forceinline void Patch_SA_10()
using namespace MemoryVP; using namespace MemoryVP;
// IsAlreadyRunning needs to be read relatively late - the later, the better // IsAlreadyRunning needs to be read relatively late - the later, the better
IsAlreadyRunning = (BOOL(*)())(*(int*)0x74872E + 0x74872D + 5); int pIsAlreadyRunning = AddressByRegion_10<int>(0x74872D);
InjectHook(0x74872D, InjectDelayedPatches_10); IsAlreadyRunning = (BOOL(*)())(*(int*)(pIsAlreadyRunning+1) + pIsAlreadyRunning + 5);
InjectHook(pIsAlreadyRunning, InjectDelayedPatches_10);
//Patch<BYTE>(0x5D7265, 0xEB); //Patch<BYTE>(0x5D7265, 0xEB);
@ -1269,7 +1276,7 @@ __forceinline void Patch_SA_10()
Patch<BYTE>(0x576F8A, 0xEB); Patch<BYTE>(0x576F8A, 0xEB);
// Make sure DirectInput mouse device is set non-exclusive (may not be needed?) // Make sure DirectInput mouse device is set non-exclusive (may not be needed?)
Patch<DWORD>(0x7469A0, 0x909000B0); Patch<DWORD>(AddressByRegion_10<DWORD>(0x7469A0), 0x909000B0);
// Weapons rendering // Weapons rendering
InjectHook(0x5E7859, RenderWeapon); InjectHook(0x5E7859, RenderWeapon);

35
SilentPatch/MemoryMgr.h
View file

@ -110,6 +110,41 @@ inline T AddressByVersion(DWORD address10, DWORD address11, DWORD addressSteam)
} }
} }
template<typename T>
inline T AddressByRegion_10(DWORD address10)
{
bool* bEuropean = GetEuropean();
signed char* bVer = GetVer();
if ( *bVer == -1 )
{
if ( *(DWORD*)0x82457C == 0x94BF )
{
*bVer = 0;
*bEuropean = false;
}
else if ( *(DWORD*)0x8245BC == 0x94BF )
{
*bVer = 0;
*bEuropean = true;
}
else
{
assert(!"AddressByRegion_10 on non-1.0 EXE!");
}
}
// Adjust to EU if needed
if ( *bEuropean && address10 > 0x7466D0 )
{
if ( address10 < 0x7BA940 )
address10 += 0x50;
else
address10 += 0x40;
}
return (T)address10;
}
namespace Memory namespace Memory
{ {
template<typename T, typename AT> template<typename T, typename AT>