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

Add compatibility shims to Lightbeam Fix and keyboard input latency fix

Browse source
This commit is contained in:
Silent 2019-03-17 15:15:45 +01:00
parent bb66303890
commit 59e24547b0
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
1 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
SilentPatchSA/SilentPatchSA.cpp
View file

@ -126,6 +126,17 @@ namespace ModCompat
LSRPMode = myIP == LSRP; LSRPMode = myIP == LSRP;
} }
namespace Utils
{
template<typename AT>
HMODULE GetModuleHandleFromAddress( AT address )
{
HMODULE result = nullptr;
GetModuleHandleEx( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT|GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, LPCTSTR(address), &result );
return result;
}
}
} }
#pragma warning(disable:4733) #pragma warning(disable:4733)
@ -1495,6 +1506,8 @@ namespace VariableResets
namespace LightbeamFix namespace LightbeamFix
{ {
static bool hookedSuccessfully = false;
static CVehicle* currentHeadLightBeamVehicle; static CVehicle* currentHeadLightBeamVehicle;
void SetCurrentVehicle( CVehicle* vehicle ) void SetCurrentVehicle( CVehicle* vehicle )
{ {
@ -2849,8 +2862,11 @@ BOOL InjectDelayedPatches_10()
DebugMenuEntry *e = DebugMenuAddVar( "SilentPatch", "Rotors fix", &CVehicle::ms_rotorFixOverride, nullptr, 1, -1, 1, str); DebugMenuEntry *e = DebugMenuAddVar( "SilentPatch", "Rotors fix", &CVehicle::ms_rotorFixOverride, nullptr, 1, -1, 1, str);
DebugMenuEntrySetWrap(e, true); DebugMenuEntrySetWrap(e, true);
e = DebugMenuAddVar( "SilentPatch", "Lightbeam fix", &CVehicle::ms_lightbeamFixOverride, nullptr, 1, -1, 1, str); if ( LightbeamFix::hookedSuccessfully )
DebugMenuEntrySetWrap(e, true); {
e = DebugMenuAddVar( "SilentPatch", "Lightbeam fix", &CVehicle::ms_lightbeamFixOverride, nullptr, 1, -1, 1, str);
DebugMenuEntrySetWrap(e, true);
}
} }
#ifndef NDEBUG #ifndef NDEBUG
@ -3290,6 +3306,8 @@ void Patch_SA_10()
InstallMemValidator(); InstallMemValidator();
#endif #endif
const HINSTANCE hInstance = GetModuleHandle( nullptr );
// IsAlreadyRunning needs to be read relatively late - the later, the better // IsAlreadyRunning needs to be read relatively late - the later, the better
{ {
const uintptr_t pIsAlreadyRunning = AddressByRegion_10<uintptr_t>(0x74872D); const uintptr_t pIsAlreadyRunning = AddressByRegion_10<uintptr_t>(0x74872D);
@ -3381,6 +3399,16 @@ void Patch_SA_10()
//Patch<BYTE>(0x5B3ADD, 4); //Patch<BYTE>(0x5B3ADD, 4);
// Lightbeam fix // Lightbeam fix
// We need to check for presence of old lightbeam fix - first validate everything old SP did
if ( MemEquals( 0x6A2E95, { 0xFF, 0x52, 0x20 } ) &&
MemEquals( 0x6E0F63, { 0xA1 } ) &&
MemEquals( 0x6E0F7C, { 0x8B, 0x15 } ) &&
MemEquals( 0x6E0F95, { 0x8B, 0x0D } ) &&
MemEquals( 0x6E0FAF, { 0xA1 } ) &&
MemEquals( 0x6E13D5, { 0xA1 } ) &&
MemEquals( 0x6E13ED, { 0x8B, 0x15 } ) &&
MemEquals( 0x6E141F, { 0xA1 } )
)
{ {
using namespace LightbeamFix; using namespace LightbeamFix;
@ -3409,6 +3437,7 @@ void Patch_SA_10()
Patch( 0x6E141F + 1, &RenderStateWrapper<rwRENDERSTATECULLMODE>::PopStatePPtr ); Patch( 0x6E141F + 1, &RenderStateWrapper<rwRENDERSTATECULLMODE>::PopStatePPtr );
// Debug override registered in delayed patches // Debug override registered in delayed patches
hookedSuccessfully = true;
} }
// PS2 SUN!!!!!!!!!!!!!!!!! // PS2 SUN!!!!!!!!!!!!!!!!!
@ -3883,9 +3912,14 @@ void Patch_SA_10()
objSize = *(uint32_t*)( 0x541E1C + 1 ) * 4; objSize = *(uint32_t*)( 0x541E1C + 1 ) * 4;
ReadCall( 0x541DEB, orgClearSimButtonPressCheckers ); ReadCall( 0x541DEB, orgClearSimButtonPressCheckers );
InjectHook( 0x541DEB, ClearSimButtonPressCheckers );
Nop( 0x541E2B, 2 ); // Only hook if this call takes to somewhere in gta_sa.exe, else bail out since it's been tampered with
Nop( 0x541E3C, 2 ); if ( hInstance == ModCompat::Utils::GetModuleHandleFromAddress(orgClearSimButtonPressCheckers) )
{
InjectHook( 0x541DEB, ClearSimButtonPressCheckers );
Nop( 0x541E2B, 2 );
Nop( 0x541E3C, 2 );
}
} }