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

During riots, don't target the player group during missions

Browse source
This commit is contained in:
Silent 2024-02-24 20:20:51 +01:00
parent 309412e7d1
commit 723d56ec9c
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
1 changed files with 74 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
SilentPatchSA/SilentPatchSA.cpp
View file

@ -320,6 +320,8 @@ auto GetAnimationBlockIndex = AddressByVersion<int32_t(*)(const char* animBl
auto RequestModel = AddressByVersion<void(*)(int modelID, int priority)>(0x4087E0, { "57 8D 3C 9B", -0x8 }); auto RequestModel = AddressByVersion<void(*)(int modelID, int priority)>(0x4087E0, { "57 8D 3C 9B", -0x8 });
auto LoadAllRequestedModels = AddressByVersion<void(*)(bool bBlock)>(0x40EA10, { "A1 ? ? ? ? 03 C0", -0x20 }); auto LoadAllRequestedModels = AddressByVersion<void(*)(bool bBlock)>(0x40EA10, { "A1 ? ? ? ? 03 C0", -0x20 });
auto IsPlayerOnAMission = AddressByVersion<bool(*)()>(0x464D50, {"85 C0 74 0C 83 B8 ? ? ? ? ? 75 03 B0 01 C3", -5});
static void (__thiscall* SetVolume)(void*,float); static void (__thiscall* SetVolume)(void*,float);
static BOOL (*IsAlreadyRunning)(); static BOOL (*IsAlreadyRunning)();
static void (*TheScriptsLoad)(); static void (*TheScriptsLoad)();
@ -2418,6 +2420,53 @@ namespace JetpackKeyboardControlsHover
} }
// ============= During riots, don't target the player group during missions =============
// Fixes recruited homies panicking during Los Desperados and other riot-time missions
namespace RiotDontTargetPlayerGroupDuringMissions
{
static void* SkipTargetting;
static void* DontSkipTargetting;
__declspec(naked) void CheckIfInPlayerGroupAndOnAMission()
{
_asm
{
cmp byte ptr [ebp+2D0h], 1
jne NotInGroup
call IsPlayerOnAMission
test al, al
jz NotOnAMission
jmp SkipTargetting
NotOnAMission:
cmp byte ptr [ebp+2D0h], 1
NotInGroup:
jmp DontSkipTargetting
}
}
__declspec(naked) void CheckIfInPlayerGroupAndOnAMission_Steam()
{
_asm
{
cmp byte ptr [ebx+2D0h], 1
jne NotInGroup
call IsPlayerOnAMission
test al, al
jz NotOnAMission
jmp SkipTargetting
NotOnAMission:
cmp byte ptr [ebx+2D0h], 1
NotInGroup:
jmp DontSkipTargetting
}
}
}
// ============= LS-RP Mode stuff ============= // ============= LS-RP Mode stuff =============
namespace LSRPMode namespace LSRPMode
{ {
@ -5154,6 +5203,17 @@ void Patch_SA_10(HINSTANCE hInstance)
ReadCall(0x67EDA6, orgGetLookBehindForCar); ReadCall(0x67EDA6, orgGetLookBehindForCar);
} }
// During riots, don't target the player group during missions
// Fixes recruited homies panicking during Los Desperados and other riot-time missions
{
using namespace RiotDontTargetPlayerGroupDuringMissions;
DontSkipTargetting = (void*)0x6CD54C;
SkipTargetting = (void*)0x6CD7F4;
InjectHook(0x6CD545, CheckIfInPlayerGroupAndOnAMission, HookType::Jump);
}
#if FULL_PRECISION_D3D #if FULL_PRECISION_D3D
// Test - full precision D3D device // Test - full precision D3D device
Patch<uint8_t>( 0x7F672B+1, *(uint8_t*)(0x7F672B+1) | D3DCREATE_FPU_PRESERVE ); Patch<uint8_t>( 0x7F672B+1, *(uint8_t*)(0x7F672B+1) | D3DCREATE_FPU_PRESERVE );
@ -6828,6 +6888,20 @@ void Patch_SA_NewBinaries_Common(HINSTANCE hInstance)
InjectHook(processControl_CheckHover.get<void>(6 + 1), &ProcessControlInput_HoverWithKeyboard_Steam, HookType::Jump); InjectHook(processControl_CheckHover.get<void>(6 + 1), &ProcessControlInput_HoverWithKeyboard_Steam, HookType::Jump);
ReadCall(processControl_DoHover.get<void>(), orgGetLookBehindForCar); ReadCall(processControl_DoHover.get<void>(), orgGetLookBehindForCar);
} }
// During riots, don't target the player group during missions
// Fixes recruited homies panicking during Los Desperados and other riot-time missions
{
using namespace RiotDontTargetPlayerGroupDuringMissions;
auto targettingCheck = pattern("80 BB D0 02 00 00 01").get_one();
auto skipTargetting = get_pattern("A1 ? ? ? ? A3 ? ? ? ? C7 05 ? ? ? ? ? ? ? ? 8B 4D F4");
DontSkipTargetting = targettingCheck.get<void>(7);
SkipTargetting = skipTargetting;
InjectHook(targettingCheck.get<void>(), CheckIfInPlayerGroupAndOnAMission_Steam, HookType::Jump);
}
} }