Do not reset handling for custom models on a non-local vehicle (PR #2824)

This pull request doesn't break backwards compatibility with non-custom vehicles. This change will allow the clientside to keep server-side applied handlings, if you set the vehicle model to a custom one requested with engineRequestModel.

Since the server-side doesn't support any custom models (yet - there is a pending pull request for this and needs evaluation after this commit), the models coming from the server will always be in the expected range from 400 to 611 and must always reset the handling on the clientside. If the vehicle is local to the client, the handling must reset everytime. If the vehicle is non-local and the new model id is a custom one, the handling will not be reset and any server-side provided handling will remain and it's the duty of the scripter to synchronize that (currently).

Author: Inder00

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -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();