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

Look up frames by ID (instead of names) when possible

Browse source 
Add fallback code for ResetFrames
This commit is contained in:
Silent 2018-05-29 20:35:39 +02:00
parent f9a9404fd0
commit 108c2740a7
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
1 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
SilentPatchSA/VehicleSA.cpp
View file

@ -158,6 +158,8 @@ WRAPPER void CVehicle::Render() { VARJMP(varVehicleRender); }
static void* varIsLawEnforcementVehicle = AddressByVersion<void*>(0x6D2370, 0x6D2BA0, 0x70D8C0); static void* varIsLawEnforcementVehicle = AddressByVersion<void*>(0x6D2370, 0x6D2BA0, 0x70D8C0);
WRAPPER bool CVehicle::IsLawEnforcementVehicle() { VARJMP(varIsLawEnforcementVehicle); } WRAPPER bool CVehicle::IsLawEnforcementVehicle() { VARJMP(varIsLawEnforcementVehicle); }
auto GetFrameHierarchyId = AddressByVersion<int32_t(*)(RwFrame*)>(0x732A20, 0x733250, 0x76CC30);
void (CVehicle::*CVehicle::orgVehiclePreRender)(); void (CVehicle::*CVehicle::orgVehiclePreRender)();
void (CAutomobile::*CAutomobile::orgAutomobilePreRender)(); void (CAutomobile::*CAutomobile::orgAutomobilePreRender)();
void (CPlane::*CPlane::orgPlanePreRender)(); void (CPlane::*CPlane::orgPlanePreRender)();
@ -212,6 +214,35 @@ static RwFrame* GetFrameFromName( RwFrame* topFrame, const char* name )
return RwFrameForAllChildren( topFrame, GetFramePredicate(name) ).foundFrame; return RwFrameForAllChildren( topFrame, GetFramePredicate(name) ).foundFrame;
} }
static RwFrame* GetFrameFromID( RwFrame* topFrame, int32_t ID )
{
class GetFramePredicate
{
public:
RwFrame* foundFrame = nullptr;
GetFramePredicate( int32_t ID )
: ID( ID )
{
}
RwFrame* operator() ( RwFrame* frame )
{
if ( ID == GetFrameHierarchyId(frame) )
{
foundFrame = frame;
return nullptr;
}
RwFrameForAllChildren( frame, std::forward<GetFramePredicate>(*this) );
return foundFrame != nullptr ? nullptr : frame;
}
private:
const int32_t ID;
};
return RwFrameForAllChildren( topFrame, GetFramePredicate(ID) ).foundFrame;
}
void ReadRotorFixExceptions(const wchar_t* pPath) void ReadRotorFixExceptions(const wchar_t* pPath)
{ {
constexpr size_t SCRATCH_PAD_SIZE = 32767; constexpr size_t SCRATCH_PAD_SIZE = 32767;
@ -525,13 +556,21 @@ void CAutomobile::ResetFrames()
if ( m_pCarNode[i] != nullptr ) if ( m_pCarNode[i] != nullptr )
{ {
// Find a frame in CBaseModelInfo object // Find a frame in CBaseModelInfo object
RwFrame* origFrame = GetFrameFromName( RpClumpGetFrame(pOrigClump), GetFrameNodeName(m_pCarNode[i]) ); RwFrame* origFrame = GetFrameFromID( RpClumpGetFrame(pOrigClump), static_cast<int32_t>(i) );
if ( origFrame != nullptr ) if ( origFrame != nullptr )
{ {
// Found a frame, reset it // Found a frame, reset it
*RwFrameGetMatrix(m_pCarNode[i]) = *RwFrameGetMatrix(origFrame); *RwFrameGetMatrix(m_pCarNode[i]) = *RwFrameGetMatrix(origFrame);
RwMatrixUpdate(RwFrameGetMatrix(m_pCarNode[i])); RwMatrixUpdate(RwFrameGetMatrix(m_pCarNode[i]));
} }
else
{
// Same as original code
CMatrix matrix( RwFrameGetMatrix(m_pCarNode[i]) );
const CVector pos( matrix.GetPos() );
matrix.SetTranslate( pos.x, pos.y, pos.z );
matrix.UpdateRW();
}
} }
} }
} }
@ -544,7 +583,7 @@ void CAutomobile::ProcessPhoenixBlower( int32_t modelID )
RpClump* pOrigClump = reinterpret_cast<RpClump*>(ms_modelInfoPtrs[ modelID ]->pRwObject); RpClump* pOrigClump = reinterpret_cast<RpClump*>(ms_modelInfoPtrs[ modelID ]->pRwObject);
if ( pOrigClump != nullptr ) if ( pOrigClump != nullptr )
{ {
RwFrame* origFrame = GetFrameFromName( RpClumpGetFrame(pOrigClump), GetFrameNodeName(m_pCarNode[20]) ); RwFrame* origFrame = GetFrameFromID( RpClumpGetFrame(pOrigClump), 20 );
if ( origFrame != nullptr ) if ( origFrame != nullptr )
{ {
*RwFrameGetMatrix(m_pCarNode[20]) = *RwFrameGetMatrix(origFrame); *RwFrameGetMatrix(m_pCarNode[20]) = *RwFrameGetMatrix(origFrame);