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

Fix paintjobs vanishing after opening/closing garage without rendering the car first - SA 1.0

Browse source
This commit is contained in:
Silent 2019-08-24 13:14:32 +02:00
parent 10130d0f37
commit f9a77d2ddd
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
5 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SilentPatchSA/ModelInfoSA.cpp
View file

@ -29,6 +29,16 @@ void RemapDirt( CVehicleModelInfo* modelInfo, uint32_t dirtID )
} }
} }
uint32_t CVehicleModelInfo::GetNumRemaps() const
{
uint32_t count = 0;
while ( m_awRemapTxds[count].Get() != -1 && count < _countof(m_awRemapTxds) )
{
count++;
}
return count;
}
void CVehicleModelInfo::Shutdown() void CVehicleModelInfo::Shutdown()
{ {
CBaseModelInfo::Shutdown(); CBaseModelInfo::Shutdown();

4
SilentPatchSA/ModelInfoSA.h
View file

@ -304,7 +304,7 @@ public:
signed char m_nTertiaryColor; signed char m_nTertiaryColor;
signed char m_nQuaternaryColor; signed char m_nQuaternaryColor;
short m_awUpgrades[18]; short m_awUpgrades[18];
short m_awRemapTxds[5]; FLAUtils::int16 m_awRemapTxds[4];
class CAnimBlock* m_pAnimBlock; class CAnimBlock* m_pAnimBlock;
public: public:
@ -320,6 +320,8 @@ public:
void SetCarCustomPlate(); void SetCarCustomPlate();
void SetVehicleColour( int32_t color1, int32_t color2, int32_t color3, int32_t color4 ); void SetVehicleColour( int32_t color1, int32_t color2, int32_t color3, int32_t color4 );
uint32_t GetNumRemaps() const;
}; };
extern CBaseModelInfo** const ms_modelInfoPtrs; extern CBaseModelInfo** const ms_modelInfoPtrs;

4
SilentPatchSA/SilentPatchSA.cpp
View file

@ -4114,6 +4114,10 @@ void Patch_SA_10()
InjectHook( 0x56D220, IsMetric_LocaleBased, PATCH_JUMP ); InjectHook( 0x56D220, IsMetric_LocaleBased, PATCH_JUMP );
} }
// Fix paintjobs vanishing after opening/closing garage without rendering the car first
InjectHook( 0x6D0B70, &CVehicle::GetRemapIndex, PATCH_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 );

24
SilentPatchSA/VehicleSA.cpp
View file

@ -483,6 +483,30 @@ CPed* CVehicle::PickRandomPassenger()
return nullptr; return nullptr;
} }
int32_t CVehicle::GetRemapIndex()
{
int32_t remapTxd = m_remapTxdSlot.Get();
if ( remapTxd == -1 )
{
// Original code never checked that variable, hence the bug
remapTxd = m_remapTxdSlotToLoad.Get();
}
if ( remapTxd == -1 )
{
return -1;
}
const CVehicleModelInfo* modelInfo = static_cast<CVehicleModelInfo*>(ms_modelInfoPtrs[ m_nModelIndex.Get() ]);
for ( int32_t i = 0, j = modelInfo->GetNumRemaps(); i < j; i++ )
{
if ( modelInfo->m_awRemapTxds[i].Get() == remapTxd )
{
return i;
}
}
return -1;
}
void CHeli::Render() void CHeli::Render()
{ {
double dRotorsSpeed, dMovingRotorSpeed; double dRotorsSpeed, dMovingRotorSpeed;

6
SilentPatchSA/VehicleSA.h
View file

@ -183,7 +183,9 @@ protected:
BYTE __pad78[4]; BYTE __pad78[4];
uint32_t m_dwVehicleClass; uint32_t m_dwVehicleClass;
uint32_t m_dwVehicleSubClass; uint32_t m_dwVehicleSubClass;
BYTE __pad5[8]; FLAUtils::int16 m_remapTxdSlot;
FLAUtils::int16 m_remapTxdSlotToLoad;
RwTexture* m_pRemapTexture;
public: public:
CVehicleFlags& GetVehicleFlags() CVehicleFlags& GetVehicleFlags()
@ -266,6 +268,8 @@ public:
bool IsLawEnforcementVehicle(); bool IsLawEnforcementVehicle();
CPed* PickRandomPassenger(); CPed* PickRandomPassenger();
int32_t GetRemapIndex();
static void SetComponentRotation( RwFrame* component, eRotAxis axis, float angle, bool absolute = true ); static void SetComponentRotation( RwFrame* component, eRotAxis axis, float angle, bool absolute = true );
static void SetComponentAtomicAlpha(RpAtomic* pAtomic, int nAlpha); static void SetComponentAtomicAlpha(RpAtomic* pAtomic, int nAlpha);