jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2024-12-28 06:43:01 +05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only allow impounding cars and bikes (and their subclasses), as impounding helicopters, planes, boats makes no sense

Browse source
This commit is contained in:
Silent 2024-02-14 23:57:11 +01:00
parent 20fc94b097
commit d2606038ad
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
3 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
SilentPatchSA/SilentPatchSA.cpp
View file

@ -2117,6 +2117,22 @@ namespace GetCorrectPedModel_Lapdm1
}
// ============= Only allow impounding cars and bikes (and their subclasses), as impounding helicopters, planes, boats makes no sense =============
namespace RestrictImpoundVehicleTypes
{
template<std::size_t Index>
static bool (*orgIsThisVehicleInteresting)(CVehicle* vehicle);
template<std::size_t Index>
static bool IsThisVehicleInteresting_AndCanBeImpounded(CVehicle* vehicle)
{
return vehicle->CanThisVehicleBeImpounded() && orgIsThisVehicleInteresting<Index>(vehicle);
}
HOOK_EACH_FUNC(ShouldImpound, orgIsThisVehicleInteresting, IsThisVehicleInteresting_AndCanBeImpounded)
}
// ============= LS-RP Mode stuff =============
namespace LSRPMode
{
@ -4796,6 +4812,14 @@ void Patch_SA_10(HINSTANCE hInstance)
}
// Only allow impounding cars and bikes (and their subclasses), as impounding helicopters, planes, boats makes no sense
{
using namespace RestrictImpoundVehicleTypes;
std::array<uint32_t, 2> isThisVehicleInteresting = { 0x566794, 0x56A378 };
HookEach_ShouldImpound(isThisVehicleInteresting, InterceptCall);
}
#if FULL_PRECISION_D3D
// Test - full precision D3D device
Patch<uint8_t>( 0x7F672B+1, *(uint8_t*)(0x7F672B+1) | D3DCREATE_FPU_PRESERVE );
@ -6417,6 +6441,19 @@ void Patch_SA_NewBinaries_Common(HINSTANCE hInstance)
Patch(jumpTablePtr+4, &BikerCop_Steam);
}
}
// Only allow impounding cars and bikes (and their subclasses), as impounding helicopters, planes, boats makes no sense
{
using namespace RestrictImpoundVehicleTypes;
auto isThisVehicleInteresting_pattern = pattern("56 E8 ? ? ? ? 83 C4 04 84 C0 74 09 56 E8 ? ? ? ? 83 C4 04 56").count(2);
std::array<void*, 2> isThisVehicleInteresting = {
isThisVehicleInteresting_pattern.get(0).get<void>(1),
isThisVehicleInteresting_pattern.get(1).get<void>(1),
};
HookEach_ShouldImpound(isThisVehicleInteresting, InterceptCall);
}
}

7
SilentPatchSA/VehicleSA.cpp
View file

@ -362,6 +362,13 @@ CPed* CVehicle::PickRandomPassenger()
return nullptr;
}
bool CVehicle::CanThisVehicleBeImpounded() const
{
const bool bIsBike = m_dwVehicleClass == VEHICLE_BIKE;
const bool bIsCar = m_dwVehicleClass == VEHICLE_AUTOMOBILE && m_dwVehicleSubClass != VEHICLE_HELI && m_dwVehicleSubClass != VEHICLE_PLANE && m_dwVehicleSubClass != VEHICLE_TRAILER;
return bIsCar || bIsBike;
}
int32_t CVehicle::GetRemapIndex()
{
int32_t remapTxd = m_remapTxdSlot.Get();

1
SilentPatchSA/VehicleSA.h
View file

@ -267,6 +267,7 @@ public:
bool IsLawEnforcementVehicle();
CPed* PickRandomPassenger();
bool CanThisVehicleBeImpounded() const;
int32_t GetRemapIndex();