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

III: Integrate Fire_Head's SitInBoat

Browse source 
Exposed as a new SIT_IN_BOAT special vehicle feature

Fixes #22
This commit is contained in:
Silent 2024-05-09 21:11:22 +02:00
parent 7ad7901a3e
commit d5dc4f18a6
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
3 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SilentPatch/SVF.cpp
View file

@ -11,6 +11,7 @@ namespace SVF
constexpr std::pair< const char*, Feature > features[] = { constexpr std::pair< const char*, Feature > features[] = {
#if _GTA_III || _GTA_VC #if _GTA_III || _GTA_VC
{ "TAXI_LIGHT", Feature::TAXI_LIGHT }, { "TAXI_LIGHT", Feature::TAXI_LIGHT },
{ "SIT_IN_BOAT", Feature::SIT_IN_BOAT },
#endif #endif
#if _GTA_VC #if _GTA_VC
@ -62,6 +63,7 @@ namespace SVF
static std::multimap<int32_t, std::tuple<Feature, int32_t> > specialVehFeatures = { static std::multimap<int32_t, std::tuple<Feature, int32_t> > specialVehFeatures = {
#if _GTA_III #if _GTA_III
_registerFeatureInternal( 110, Feature::TAXI_LIGHT ), _registerFeatureInternal( 110, Feature::TAXI_LIGHT ),
_registerFeatureInternal( 142, Feature::SIT_IN_BOAT ),
#elif _GTA_VC #elif _GTA_VC
_registerFeatureInternal( 147, Feature::FBI_WASHINGTON_SIREN ), _registerFeatureInternal( 147, Feature::FBI_WASHINGTON_SIREN ),
_registerFeatureInternal( 150, Feature::TAXI_LIGHT ), _registerFeatureInternal( 150, Feature::TAXI_LIGHT ),

1
SilentPatch/SVF.h
View file

@ -10,6 +10,7 @@ namespace SVF
#if _GTA_III || _GTA_VC #if _GTA_III || _GTA_VC
TAXI_LIGHT, // Corrected light placement for Taxi TAXI_LIGHT, // Corrected light placement for Taxi
SIT_IN_BOAT, // Sitting animation in the boat, used in Speeder
#endif #endif
#if _GTA_VC #if _GTA_VC

38
SilentPatchIII/SilentPatchIII.cpp
View file

@ -8,6 +8,7 @@
#include "VehicleIII.h" #include "VehicleIII.h"
#include "ModelInfoIII.h" #include "ModelInfoIII.h"
#include "TheFLAUtils.h" #include "TheFLAUtils.h"
#include "SVF.h"
#include <array> #include <array>
#include <memory> #include <memory>
@ -766,6 +767,30 @@ namespace GenerateNewPickup_ReuseObjectFix
} }
// ============= Sitting in boat (Speeder), implemented as a special vehicle feature =============
// Based off SitInBoat from Fire_Head
namespace SitInBoat
{
static bool bSitInBoat = false;
static CVector* (*orgGetPositionToOpenCarDoor)(CVector*, CVehicle*, unsigned int);
static CVector* GetPositionToOpenCarDoor_CheckSitInBoat(CVector* out, CVehicle* vehicle, unsigned int type)
{
bSitInBoat = SVF::ModelHasFeature(vehicle->GetModelIndex(), SVF::Feature::SIT_IN_BOAT);
return orgGetPositionToOpenCarDoor(out, vehicle, type);
}
static void* (*orgBlendAnimation)(void*, unsigned int, unsigned int, float);
static void* BlendAnimation_SitInBoat(void* clump, unsigned int groupId, unsigned int animationId, float factor)
{
if (bSitInBoat)
{
animationId = 0x6F; // ANIMATION_CAR_SIT
}
return orgBlendAnimation(clump, groupId, animationId, factor);
}
}
void InjectDelayedPatches_III_Common( bool bHasDebugMenu, const wchar_t* wcModulePath ) void InjectDelayedPatches_III_Common( bool bHasDebugMenu, const wchar_t* wcModulePath )
{ {
using namespace Memory; using namespace Memory;
@ -1638,6 +1663,19 @@ void Patch_III_Common()
pPickupObject = *give_us_a_pick_up_object.get<void*>(7 + 2); pPickupObject = *give_us_a_pick_up_object.get<void*>(7 + 2);
InterceptCall(give_us_a_pick_up_object.get<void>(2), orgGiveUsAPickUpObject, GiveUsAPickUpObject_CleanUpObject); InterceptCall(give_us_a_pick_up_object.get<void>(2), orgGiveUsAPickUpObject, GiveUsAPickUpObject_CleanUpObject);
} }
// Sitting in boat (Speeder), implemented as a special vehicle feature
// Based off SitInBoat from Fire_Head
{
using namespace SitInBoat;
auto get_position_to_open_car_door = get_pattern("E8 ? ? ? ? 8B 93 ? ? ? ? 83 C4 0C");
auto blend_animation = get_pattern("6A 7A 6A 00 50 DD D8 E8 ? ? ? ? 83 C4 10", 7);
InterceptCall(get_position_to_open_car_door, orgGetPositionToOpenCarDoor, GetPositionToOpenCarDoor_CheckSitInBoat);
InterceptCall(blend_animation, orgBlendAnimation, BlendAnimation_SitInBoat);
}
} }
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)