Skip to content

Fix setVehicleVariant turns on the engine #3486

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

Merged
merged 6 commits into from
Jul 31, 2025
Merged

Fix setVehicleVariant turns on the engine #3486

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
995d0b5
Revert "Bump client net module version"
Proxy-99 Jun 17, 2024
efb4154
fix engine
Proxy-99 Jun 17, 2024
88b507a
Reapply "Bump client net module version"
Proxy-99 Jun 17, 2024
e2775cd
set the engine after warp
Proxy-99 Jun 17, 2024
bf296aa
foramt correction
Proxy-99 Jun 19, 2024
d598216
Merge branch 'master' into engine_bugs
Proxy-99 Jul 4, 2024
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
4 changes: 2 additions & 2 deletions Client/mods/deathmatch/logic/CClientVehicle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,6 @@ void CClientVehicle::SetVariant(unsigned char ucVariant, unsigned char ucVariant

// clear our component data to regenerate it
m_ComponentData.clear();

ReCreate();
}

Expand Down Expand Up @@ -2585,7 +2584,6 @@ void CClientVehicle::Create()
m_pVehicle->SetOverrideLights(m_ucOverrideLights);
m_pVehicle->SetRemap(static_cast<unsigned int>(m_ucPaintjob));
m_pVehicle->SetBodyDirtLevel(m_fDirtLevel);
m_pVehicle->SetEngineOn(m_bEngineOn);
m_pVehicle->SetAreaCode(m_ucInterior);
m_pVehicle->SetSmokeTrailEnabled(m_bSmokeTrail);
m_pVehicle->SetGravity(&m_vecGravity);
Expand Down Expand Up @@ -2638,6 +2636,8 @@ void CClientVehicle::Create()
if (m_pDriver)
m_pDriver->WarpIntoVehicle(this, 0);

m_pVehicle->SetEngineOn(m_bEngineOn);

// Warp the passengers back in
for (unsigned int i = 0; i < 8; i++)
{
Expand Down