Skip to content

Commit ba3595e

Browse files
committed
Revert "Reset vehicle handling only for client-side vehicles when changing model (PR #2501)"
This reverts commit 42057d5.
1 parent 0b9b6f3 commit ba3595e

File tree

1 file changed

+20
-23
lines changed

1 file changed

+20
-23
lines changed

Client/mods/deathmatch/logic/CClientVehicle.cpp

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,35 +1068,32 @@ void CClientVehicle::SetModelBlocking(unsigned short usModel, unsigned char ucVa
10681068
m_ucMaxPassengers = CClientVehicleManager::GetMaxPassengerCount(usModel);
10691069

10701070
// Reset handling to fit the vehicle
1071-
if (IsLocalEntity())
1072-
{
1073-
ushort usHandlingModelID = usModel;
1074-
if (usHandlingModelID < 400 || usHandlingModelID > 611)
1075-
usHandlingModelID = m_pModelInfo->GetParentID();
1071+
ushort usHandlingModelID = usModel;
1072+
if (usHandlingModelID < 400 || usHandlingModelID > 611)
1073+
usHandlingModelID = m_pModelInfo->GetParentID();
10761074

1077-
m_pOriginalHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalHandlingData((eVehicleTypes)usHandlingModelID);
1078-
m_pHandlingEntry->Assign(m_pOriginalHandlingEntry);
1075+
m_pOriginalHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalHandlingData((eVehicleTypes)usHandlingModelID);
1076+
m_pHandlingEntry->Assign(m_pOriginalHandlingEntry);
10791077

1080-
m_pOriginalFlyingHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalFlyingHandlingData((eVehicleTypes)usHandlingModelID);
1081-
m_pFlyingHandlingEntry->Assign(m_pOriginalFlyingHandlingEntry);
1078+
m_pOriginalFlyingHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalFlyingHandlingData((eVehicleTypes)usHandlingModelID);
1079+
m_pFlyingHandlingEntry->Assign(m_pOriginalFlyingHandlingEntry);
10821080

1083-
m_pOriginalBoatHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBoatHandlingData((eVehicleTypes)usHandlingModelID);
1084-
if (m_pOriginalBoatHandlingEntry)
1085-
{
1086-
if (!m_pBoatHandlingEntry)
1087-
m_pBoatHandlingEntry = g_pGame->GetHandlingManager()->CreateBoatHandlingData();
1081+
m_pOriginalBoatHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBoatHandlingData((eVehicleTypes)usHandlingModelID);
1082+
if (m_pOriginalBoatHandlingEntry)
1083+
{
1084+
if (!m_pBoatHandlingEntry)
1085+
m_pBoatHandlingEntry = g_pGame->GetHandlingManager()->CreateBoatHandlingData();
10881086

1089-
m_pBoatHandlingEntry->Assign(m_pOriginalBoatHandlingEntry);
1090-
}
1087+
m_pBoatHandlingEntry->Assign(m_pOriginalBoatHandlingEntry);
1088+
}
10911089

1092-
m_pOriginalBikeHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBikeHandlingData((eVehicleTypes)usHandlingModelID);
1093-
if (m_pOriginalBikeHandlingEntry)
1094-
{
1095-
if (!m_pBikeHandlingEntry)
1096-
m_pBikeHandlingEntry = g_pGame->GetHandlingManager()->CreateBikeHandlingData();
1090+
m_pOriginalBikeHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBikeHandlingData((eVehicleTypes)usHandlingModelID);
1091+
if (m_pOriginalBikeHandlingEntry)
1092+
{
1093+
if (!m_pBikeHandlingEntry)
1094+
m_pBikeHandlingEntry = g_pGame->GetHandlingManager()->CreateBikeHandlingData();
10971095

1098-
m_pBikeHandlingEntry->Assign(m_pOriginalBikeHandlingEntry);
1099-
}
1096+
m_pBikeHandlingEntry->Assign(m_pOriginalBikeHandlingEntry);
11001097
}
11011098

11021099
ApplyHandling();

0 commit comments

Comments
 (0)