Skip to content

Bugfix: setElementModel reset handling for vehicles created on the server-side #2824

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 10 commits into from
Dec 4, 2022
Merged

Bugfix: setElementModel reset handling for vehicles created on the server-side #2824

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ed30bfb
Don't restore default handling for server-sided vehicle changed their…
Inder00 Jan 5, 2022
82e940b
Merge branch 'master' into fix/custom-model-handling
Inder00 Oct 16, 2022
d10262b
Merge branch 'master' into fix/custom-model-handling
Inder00 Oct 16, 2022
9a33144
Merge branch 'master' into fix/custom-model-handling
Inder00 Oct 16, 2022
26793c3
Fixes
Inder00 Oct 16, 2022
4057850
Merge branch 'master' into fix/custom-model-handling
Inder00 Oct 19, 2022
97b6489
Remove unnecessary "restoreHandling" param and use IsLocalEntity instead
Inder00 Dec 2, 2022
1473f9f
Merge branch 'master' into fix/custom-model-handling
Inder00 Dec 2, 2022
5212eeb
Apply fixes for checking vehicle entity
Inder00 Dec 4, 2022
80f4486
Merge branch 'master' into fix/custom-model-handling
Inder00 Dec 4, 2022
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
43 changes: 23 additions & 20 deletions Client/mods/deathmatch/logic/CClientVehicle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,32 +1068,35 @@ void CClientVehicle::SetModelBlocking(unsigned short usModel, unsigned char ucVa
m_ucMaxPassengers = CClientVehicleManager::GetMaxPassengerCount(usModel);

// Reset handling to fit the vehicle
ushort usHandlingModelID = usModel;
if (usHandlingModelID < 400 || usHandlingModelID > 611)
usHandlingModelID = m_pModelInfo->GetParentID();
if (IsLocalEntity() || !(usModel < 400 || usModel > 611))
{
ushort usHandlingModelID = usModel;
if (usHandlingModelID < 400 || usHandlingModelID > 611)
usHandlingModelID = m_pModelInfo->GetParentID();

m_pOriginalHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalHandlingData((eVehicleTypes)usHandlingModelID);
m_pHandlingEntry->Assign(m_pOriginalHandlingEntry);
m_pOriginalHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalHandlingData((eVehicleTypes)usHandlingModelID);
m_pHandlingEntry->Assign(m_pOriginalHandlingEntry);

m_pOriginalFlyingHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalFlyingHandlingData((eVehicleTypes)usHandlingModelID);
m_pFlyingHandlingEntry->Assign(m_pOriginalFlyingHandlingEntry);
m_pOriginalFlyingHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalFlyingHandlingData((eVehicleTypes)usHandlingModelID);
m_pFlyingHandlingEntry->Assign(m_pOriginalFlyingHandlingEntry);

m_pOriginalBoatHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBoatHandlingData((eVehicleTypes)usHandlingModelID);
if (m_pOriginalBoatHandlingEntry)
{
if (!m_pBoatHandlingEntry)
m_pBoatHandlingEntry = g_pGame->GetHandlingManager()->CreateBoatHandlingData();
m_pOriginalBoatHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBoatHandlingData((eVehicleTypes)usHandlingModelID);
if (m_pOriginalBoatHandlingEntry)
{
if (!m_pBoatHandlingEntry)
m_pBoatHandlingEntry = g_pGame->GetHandlingManager()->CreateBoatHandlingData();

m_pBoatHandlingEntry->Assign(m_pOriginalBoatHandlingEntry);
}
m_pBoatHandlingEntry->Assign(m_pOriginalBoatHandlingEntry);
}

m_pOriginalBikeHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBikeHandlingData((eVehicleTypes)usHandlingModelID);
if (m_pOriginalBikeHandlingEntry)
{
if (!m_pBikeHandlingEntry)
m_pBikeHandlingEntry = g_pGame->GetHandlingManager()->CreateBikeHandlingData();
m_pOriginalBikeHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBikeHandlingData((eVehicleTypes)usHandlingModelID);
if (m_pOriginalBikeHandlingEntry)
{
if (!m_pBikeHandlingEntry)
m_pBikeHandlingEntry = g_pGame->GetHandlingManager()->CreateBikeHandlingData();

m_pBikeHandlingEntry->Assign(m_pOriginalBikeHandlingEntry);
m_pBikeHandlingEntry->Assign(m_pOriginalBikeHandlingEntry);
}
}

ApplyHandling();
Expand Down