Skip to content

Fix door and damage sync of vehicles added with engineRequestModel() #2421

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 7 commits into from
Oct 28, 2021
Merged

Fix door and damage sync of vehicles added with engineRequestModel() #2421

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4eda095
Fix #2166, fix #2167: Use parent model ID of non-standard vehicle model
BCG2000 May 30, 2021
1513e19
Merge branch 'multitheftauto:master' into master
BCG2000 Oct 19, 2021
853ba66
Update CNetAPI.cpp
BCG2000 Oct 25, 2021
2bda0a8
Update CNetAPI.cpp
BCG2000 Oct 25, 2021
21c8b10
Fix door and damage sync of vehicles added with engineRequestModel()
BCG2000 Oct 25, 2021
1fba2cf
Update CNetAPI.cpp
BCG2000 Oct 25, 2021
5258f20
Fix door and damage sync of vehicles added with engineRequestModel()
BCG2000 Oct 25, 2021
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
8 changes: 7 additions & 1 deletion Client/mods/deathmatch/logic/CNetAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1547,9 +1547,15 @@ void CNetAPI::WriteVehiclePuresync(CClientPed* pPlayerModel, CClientVehicle* pVe
pPlayerModel->GetControllerState(ControllerState);
WriteFullKeysync(ControllerState, BitStream);

// Use parent model ID for non-standard vehicle model IDs.
// This avoids a mismatch between client and server, ensuring doors and damage sync correctly.
int iModelID = pVehicle->GetModel();
if (iModelID < 400 || iModelID > 611)
iModelID = pVehicle->GetModelInfo()->GetParentID();

// Write the clientside model
if (BitStream.Version() >= 0x05F)
BitStream.Write((int)pVehicle->GetModel());
BitStream.Write(iModelID);

// Grab the vehicle position
CVector vecPosition;
Expand Down