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

SA: Fix wheels detaching after they were made invisible when the car explodes

Browse source 
It was fine in the stock game, regressed once SP made the game pick
a random wheel to detach when exploding.

Fixes #47
This commit is contained in:
Silent 2024-10-30 19:44:13 +01:00
parent 2de40406d2
commit cdcf979a54
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
1 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
SilentPatchSA/VehicleSA.cpp
View file

@ -582,66 +582,56 @@ void CAutomobile::AfterPreRender()
} }
} }
void CAutomobile::HideDestroyedWheels_SilentPatch(void (CAutomobile::*spawnFlyingComponentCB)(int, unsigned int), int nodeID, unsigned int modelID) void CAutomobile::HideDestroyedWheels_SilentPatch(void (CAutomobile::*spawnFlyingComponentCB)(int, unsigned int), int, unsigned int modelID)
{ {
auto hideWheel = [this](int nodeID) auto trySpawnAndHideWheel = [this, spawnFlyingComponentCB, modelID](int nodeID)
{ {
bool bHasWheel = false;
RwFrame* wheelNode = m_pCarNode[nodeID]; RwFrame* wheelNode = m_pCarNode[nodeID];
if (wheelNode != nullptr) if (wheelNode != nullptr)
{ {
RwFrameForAllObjects(wheelNode, [&bHasWheel](RwObject* object) bool bWheelVisible = false;
RwFrameForAllObjects(wheelNode, [&bWheelVisible](RwObject* object) -> RwObject*
{ {
if ((rwObjectGetFlags(object) & rpATOMICRENDER) != 0) if ((rwObjectGetFlags(object) & rpATOMICRENDER) != 0)
{ {
rwObjectSetFlags(object, 0); bWheelVisible = true;
bHasWheel = true; return nullptr;
} }
return object; return object;
}); });
if (bWheelVisible)
{
std::invoke(spawnFlyingComponentCB, this, nodeID, modelID);
RwFrameForAllObjects(wheelNode, [](RwObject* object)
{
rwObjectSetFlags(object, 0);
return object;
});
}
} }
return bHasWheel;
}; };
if (m_DamageManager.GetWheelStatus(0) == 2) if (m_DamageManager.GetWheelStatus(0) == 2)
{ {
if (hideWheel(5)) trySpawnAndHideWheel(5);
{
std::invoke(spawnFlyingComponentCB, this, 5, modelID);
}
} }
if (m_DamageManager.GetWheelStatus(2) == 2) if (m_DamageManager.GetWheelStatus(2) == 2)
{ {
if (hideWheel(2)) trySpawnAndHideWheel(2);
{
std::invoke(spawnFlyingComponentCB, this, 2, modelID);
}
} }
// For rear wheels, also hide and spawn the middle wheel (if it exists) // For rear wheels, also hide and spawn the middle wheel (if it exists)
if (m_DamageManager.GetWheelStatus(1) == 2) if (m_DamageManager.GetWheelStatus(1) == 2)
{ {
if (hideWheel(6)) trySpawnAndHideWheel(6);
{ trySpawnAndHideWheel(7);
std::invoke(spawnFlyingComponentCB, this, 6, modelID);
}
if (hideWheel(7))
{
std::invoke(spawnFlyingComponentCB, this, 7, modelID);
}
} }
if (m_DamageManager.GetWheelStatus(3) == 2) if (m_DamageManager.GetWheelStatus(3) == 2)
{ {
if (hideWheel(3)) trySpawnAndHideWheel(3);
{ trySpawnAndHideWheel(4);
std::invoke(spawnFlyingComponentCB, this, 3, modelID);
}
if (hideWheel(4))
{
std::invoke(spawnFlyingComponentCB, this, 4, modelID);
}
} }
} }