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

Towtruck bouncing panel does not get reset on CAuomobile::Fix

Browse source 
misc_x parts don't get reset too (Bandito fix)
This commit is contained in:
Silent 2014-08-11 22:44:57 +02:00
parent 17106b72c0
commit a01c8fc730
3 changed files with 58 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
SAFix/SilentPatchSA.cpp
View file

@ -1406,6 +1406,18 @@ __forceinline void Patch_SA_10()
Patch<bool*>(0x6B4EC0, bEnableMouseSteering); Patch<bool*>(0x6B4EC0, bEnableMouseSteering);
Patch<bool*>(0x6CE827, bEnableMouseSteering); Patch<bool*>(0x6CE827, bEnableMouseSteering);
// Patched CAutomobile::Fix
// misc_x parts don't get reset (Bandito fix), Towtruck's bouncing panel is not reset
//Patch<WORD>(0x6A34C9, 0x5EEB);
Patch<DWORD>(0x6A34D0, 10);
Patch<DWORD>(0x6A3555, 0x5E5FCF8B);
Patch<DWORD>(0x6A3559, 0x448B5B5D);
Patch<DWORD>(0x6A355D, 0x89644824);
Patch<DWORD>(0x6A3561, 5);
Patch<DWORD>(0x6A3565, 0x54C48300);
InjectHook(0x6A3569, &CAutomobile::Fix_SilentPatch, PATCH_JUMP);
// Zones fix // Zones fix
InjectHook(0x572130, GetCurrentZoneLockedOrUnlocked, PATCH_JUMP); InjectHook(0x572130, GetCurrentZoneLockedOrUnlocked, PATCH_JUMP);

44
SAFix/VehicleSA.cpp
View file

@ -98,8 +98,8 @@ void CVehicle::CustomCarPlate_BeforeRenderingStart(CVehicleModelInfo* pModelInfo
void CHeli::Render() void CHeli::Render()
{ {
double dRotorsSpeed, dMovingRotorSpeed; double dRotorsSpeed, dMovingRotorSpeed;
bool bHasMovingRotor = m_pCarNode[12] != nullptr; bool bHasMovingRotor = m_pCarNode[13] != nullptr;
bool bHasMovingRotor2 = m_pCarNode[14] != nullptr; bool bHasMovingRotor2 = m_pCarNode[15] != nullptr;
m_nTimeTillWeNeedThisCar = CTimer::m_snTimeInMilliseconds + 3000; m_nTimeTillWeNeedThisCar = CTimer::m_snTimeInMilliseconds + 3000;
@ -115,18 +115,18 @@ void CHeli::Render()
int nStaticRotorAlpha = static_cast<int>(min((1.5-dRotorsSpeed) * 255.0, 255)); int nStaticRotorAlpha = static_cast<int>(min((1.5-dRotorsSpeed) * 255.0, 255));
int nMovingRotorAlpha = static_cast<int>(min(dMovingRotorSpeed * 175.0, 175)); int nMovingRotorAlpha = static_cast<int>(min(dMovingRotorSpeed * 175.0, 175));
if ( m_pCarNode[11] ) if ( m_pCarNode[12] )
{ {
RpAtomic* pOutAtomic = nullptr; RpAtomic* pOutAtomic = nullptr;
RwFrameForAllObjects(m_pCarNode[11], GetCurrentAtomicObjectCB, &pOutAtomic); RwFrameForAllObjects(m_pCarNode[12], GetCurrentAtomicObjectCB, &pOutAtomic);
if ( pOutAtomic ) if ( pOutAtomic )
SetComponentAtomicAlpha(pOutAtomic, bHasMovingRotor ? nStaticRotorAlpha : 255); SetComponentAtomicAlpha(pOutAtomic, bHasMovingRotor ? nStaticRotorAlpha : 255);
} }
if ( m_pCarNode[13] ) if ( m_pCarNode[14] )
{ {
RpAtomic* pOutAtomic = nullptr; RpAtomic* pOutAtomic = nullptr;
RwFrameForAllObjects(m_pCarNode[13], GetCurrentAtomicObjectCB, &pOutAtomic); RwFrameForAllObjects(m_pCarNode[14], GetCurrentAtomicObjectCB, &pOutAtomic);
if ( pOutAtomic ) if ( pOutAtomic )
SetComponentAtomicAlpha(pOutAtomic, bHasMovingRotor2 ? nStaticRotorAlpha : 255); SetComponentAtomicAlpha(pOutAtomic, bHasMovingRotor2 ? nStaticRotorAlpha : 255);
} }
@ -134,7 +134,7 @@ void CHeli::Render()
if ( bHasMovingRotor ) if ( bHasMovingRotor )
{ {
RpAtomic* pOutAtomic = nullptr; RpAtomic* pOutAtomic = nullptr;
RwFrameForAllObjects(m_pCarNode[12], GetCurrentAtomicObjectCB, &pOutAtomic); RwFrameForAllObjects(m_pCarNode[13], GetCurrentAtomicObjectCB, &pOutAtomic);
if ( pOutAtomic ) if ( pOutAtomic )
SetComponentAtomicAlpha(pOutAtomic, nMovingRotorAlpha); SetComponentAtomicAlpha(pOutAtomic, nMovingRotorAlpha);
} }
@ -142,7 +142,7 @@ void CHeli::Render()
if ( bHasMovingRotor2 ) if ( bHasMovingRotor2 )
{ {
RpAtomic* pOutAtomic = nullptr; RpAtomic* pOutAtomic = nullptr;
RwFrameForAllObjects(m_pCarNode[14], GetCurrentAtomicObjectCB, &pOutAtomic); RwFrameForAllObjects(m_pCarNode[15], GetCurrentAtomicObjectCB, &pOutAtomic);
if ( pOutAtomic ) if ( pOutAtomic )
SetComponentAtomicAlpha(pOutAtomic, nMovingRotorAlpha); SetComponentAtomicAlpha(pOutAtomic, nMovingRotorAlpha);
} }
@ -153,8 +153,8 @@ void CHeli::Render()
void CPlane::Render() void CPlane::Render()
{ {
double dRotorsSpeed, dMovingRotorSpeed; double dRotorsSpeed, dMovingRotorSpeed;
bool bHasMovingProp = m_pCarNode[12] != nullptr; bool bHasMovingProp = m_pCarNode[13] != nullptr;
bool bHasMovingProp2 = m_pCarNode[14] != nullptr; bool bHasMovingProp2 = m_pCarNode[15] != nullptr;
m_nTimeTillWeNeedThisCar = CTimer::m_snTimeInMilliseconds + 3000; m_nTimeTillWeNeedThisCar = CTimer::m_snTimeInMilliseconds + 3000;
@ -170,18 +170,18 @@ void CPlane::Render()
int nStaticRotorAlpha = static_cast<int>(min((1.5-dRotorsSpeed) * 255.0, 255)); int nStaticRotorAlpha = static_cast<int>(min((1.5-dRotorsSpeed) * 255.0, 255));
int nMovingRotorAlpha = static_cast<int>(min(dMovingRotorSpeed * 175.0, 175)); int nMovingRotorAlpha = static_cast<int>(min(dMovingRotorSpeed * 175.0, 175));
if ( m_pCarNode[11] ) if ( m_pCarNode[12] )
{ {
RpAtomic* pOutAtomic = nullptr; RpAtomic* pOutAtomic = nullptr;
RwFrameForAllObjects(m_pCarNode[11], GetCurrentAtomicObjectCB, &pOutAtomic); RwFrameForAllObjects(m_pCarNode[12], GetCurrentAtomicObjectCB, &pOutAtomic);
if ( pOutAtomic ) if ( pOutAtomic )
SetComponentAtomicAlpha(pOutAtomic, bHasMovingProp ? nStaticRotorAlpha : 255); SetComponentAtomicAlpha(pOutAtomic, bHasMovingProp ? nStaticRotorAlpha : 255);
} }
if ( m_pCarNode[13] ) if ( m_pCarNode[14] )
{ {
RpAtomic* pOutAtomic = nullptr; RpAtomic* pOutAtomic = nullptr;
RwFrameForAllObjects(m_pCarNode[13], GetCurrentAtomicObjectCB, &pOutAtomic); RwFrameForAllObjects(m_pCarNode[14], GetCurrentAtomicObjectCB, &pOutAtomic);
if ( pOutAtomic ) if ( pOutAtomic )
SetComponentAtomicAlpha(pOutAtomic, bHasMovingProp2 ? nStaticRotorAlpha : 255); SetComponentAtomicAlpha(pOutAtomic, bHasMovingProp2 ? nStaticRotorAlpha : 255);
} }
@ -189,7 +189,7 @@ void CPlane::Render()
if ( bHasMovingProp ) if ( bHasMovingProp )
{ {
RpAtomic* pOutAtomic = nullptr; RpAtomic* pOutAtomic = nullptr;
RwFrameForAllObjects(m_pCarNode[12], GetCurrentAtomicObjectCB, &pOutAtomic); RwFrameForAllObjects(m_pCarNode[13], GetCurrentAtomicObjectCB, &pOutAtomic);
if ( pOutAtomic ) if ( pOutAtomic )
SetComponentAtomicAlpha(pOutAtomic, nMovingRotorAlpha); SetComponentAtomicAlpha(pOutAtomic, nMovingRotorAlpha);
} }
@ -197,10 +197,22 @@ void CPlane::Render()
if ( bHasMovingProp2 ) if ( bHasMovingProp2 )
{ {
RpAtomic* pOutAtomic = nullptr; RpAtomic* pOutAtomic = nullptr;
RwFrameForAllObjects(m_pCarNode[14], GetCurrentAtomicObjectCB, &pOutAtomic); RwFrameForAllObjects(m_pCarNode[15], GetCurrentAtomicObjectCB, &pOutAtomic);
if ( pOutAtomic ) if ( pOutAtomic )
SetComponentAtomicAlpha(pOutAtomic, nMovingRotorAlpha); SetComponentAtomicAlpha(pOutAtomic, nMovingRotorAlpha);
} }
CVehicle::Render(); CVehicle::Render();
}
void CAutomobile::Fix_SilentPatch()
{
// Reset bouncing panels
for ( int i = 0; i < 3; i++ )
{
// Towtruck/Tractor fix
if ( i == 0 && (m_nModelIndex == 525 && m_pCarNode[21]) || (m_nModelIndex == 531 && m_pCarNode[17]) )
continue;
m_aBouncingPanel[i].m_nNodeIndex = -1;
}
} }

23
SAFix/VehicleSA.h
View file

@ -86,6 +86,16 @@ struct CVehicleFlags
unsigned char bUsedForReplay: 1; // This car is controlled by replay and should be removed when replay is done. unsigned char bUsedForReplay: 1; // This car is controlled by replay and should be removed when replay is done.
}; };
class CBouncingPanel
{
public:
short m_nNodeIndex;
short m_nBouncingType;
float m_fBounceRange;
CVector field_8;
CVector m_vecBounceVector;
};
class NOVMT CVehicle : public CPhysical class NOVMT CVehicle : public CPhysical
{ {
protected: protected:
@ -121,13 +131,15 @@ public:
class NOVMT CAutomobile : public CVehicle class NOVMT CAutomobile : public CVehicle
{ {
public: public:
BYTE paddd[172]; BYTE paddd[168];
RwFrame* m_pCarNode[20]; // May be wrong? RwFrame* m_pCarNode[25];
BYTE padding[432]; CBouncingPanel m_aBouncingPanel[3];
float m_fRotorSpeed; BYTE padding[320];
BYTE __moarpad[312]; float m_fRotorSpeed;
BYTE __moarpad[312];
public: public:
void Fix_SilentPatch();
}; };
class NOVMT CHeli : public CAutomobile class NOVMT CHeli : public CAutomobile
@ -152,6 +164,7 @@ public:
virtual void Render() override; virtual void Render() override;
}; };
static_assert(sizeof(CBouncingPanel) == 0x20, "Wrong size: CBouncingPanel");
static_assert(sizeof(CVehicle) == 0x5A0, "Wrong size: CVehicle"); static_assert(sizeof(CVehicle) == 0x5A0, "Wrong size: CVehicle");
static_assert(sizeof(CAutomobile) == 0x988, "Wrong size: CAutomobile"); static_assert(sizeof(CAutomobile) == 0x988, "Wrong size: CAutomobile");