Skip to content

Fix getVehicleDummyPosition returning 0,0,0 for the second exhaust #4949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheCrazy17 wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −4
Open

Fix getVehicleDummyPosition returning 0,0,0 for the second exhaust #4949

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Client/mods/deathmatch/logic/CClientVehicle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5076,13 +5076,21 @@ CVehicleAudioSettingsEntry& CClientVehicle::GetOrCreateAudioSettings()

bool CClientVehicle::GetDummyPosition(VehicleDummies dummy, CVector& position) const
{
if (dummy >= VehicleDummies::LIGHT_FRONT_MAIN && dummy < VehicleDummies::VEHICLE_DUMMY_COUNT)
if (dummy < VehicleDummies::LIGHT_FRONT_MAIN || dummy >= VehicleDummies::VEHICLE_DUMMY_COUNT)
return false;

position = m_dummyPositions[(std::size_t)dummy];

// Most models have no second exhaust dummy, in which case the game mirrors the primary
// exhaust on the X axis (see ApplyExhaustParticlesPosition). Reflect that here, so the
// reported position matches where the effects actually appear
if (dummy == VehicleDummies::EXHAUST_SECONDARY && position == CVector())
{
position = m_dummyPositions[(std::size_t)dummy];
return true;
position = m_dummyPositions[(std::size_t)VehicleDummies::EXHAUST];
position.fX = -position.fX;
}

return false;
return true;
}

bool CClientVehicle::SetDummyPosition(VehicleDummies dummy, const CVector& position)
Expand Down