Update 7

Author: G_Moris

Client/game_sa/CHandlingManagerSA.cpp

@@ -124,8 +124,8 @@ static bool IsVehicleModel(std::uint32_t model) noexcept
 {
     try
     {
-        const auto* const pModelInfo = pGame->GetModelInfo(model);
-        return pModelInfo && pModelInfo->IsVehicle();
+        const auto* const modelInfo = pGame->GetModelInfo(model);
+        return modelInfo && modelInfo->IsVehicle();
     }
     catch (...)
     {

Client/game_sa/CModelInfoSA.cpp

@@ -290,8 +290,8 @@ bool CModelInfoSA::IsVehicle() const
         return false;
 
     // NOTE(botder): m_pInterface might be a nullptr here, we can't use it
-    CBaseModelInfoSAInterface* pModel = ppModelInfo[m_dwModelID];
-    return pModel && reinterpret_cast<intptr_t>(pModel->VFTBL) == vftable_CVehicleModelInfo;
+    CBaseModelInfoSAInterface* model = ppModelInfo[m_dwModelID];
+    return model && reinterpret_cast<intptr_t>(model->VFTBL) == vftable_CVehicleModelInfo;
 }
 
 bool CModelInfoSA::IsPlayerModel()

Client/game_sa/CPoolsSA.cpp

@@ -86,11 +86,12 @@ CVehicle* CPoolsSA::AddVehicle(CClientVehicle* pClientVehicle, std::uint16_t mod
         if (!pInterface)
             return nullptr;
 
-        const auto* const pModelInfo = pGame->GetModelInfo(model);
-        if (!pModelInfo || !pModelInfo->IsVehicle())
+        // Valid model?
+        const auto* const modelInfo = pGame->GetModelInfo(model);
+        if (!modelInfo || !modelInfo->IsVehicle())
             return nullptr;
 
-        auto vehicleClass = static_cast<VehicleClass>(pModelInfo->GetVehicleType());
+        auto vehicleClass = static_cast<VehicleClass>(modelInfo->GetVehicleType());
 
         std::unique_ptr<CVehicleSA> vehicle = nullptr;
         switch (vehicleClass)
@@ -585,16 +586,21 @@ static void CreateMissionTrain(const CVector& vecPos, bool bDirection, std::uint
     }
 }
 
-CVehicle* CPoolsSA::AddTrain(CClientVehicle* pClientVehicle, const CVector& vecPosition, std::vector<DWORD> Models, bool bDirection,
+CVehicle* CPoolsSA::AddTrain(CClientVehicle* pClientVehicle, const CVector& vecPosition, std::vector<DWORD> models, bool bDirection,
                              std::uint8_t ucTrackId) noexcept
 {
     // clean the existing array
     MemSetFast((void*)VAR_TrainModelArray, 0, 32 * sizeof(DWORD));
 
     // now load the models we're going to use and add them to the array
     std::size_t count = 0;
-    for (const auto model : Models)
+    for (const auto model : models)
     {
+        // Valid model?
+        const auto* const modelInfo = pGame->GetModelInfo(model);
+        if (!modelInfo || !modelInfo->IsVehicle())
+            return nullptr;
+
         if (model == 449 || model == 537 || model == 538 || model == 569 || model == 590 || model == 570)
         {
             MemPutFast<DWORD>(VAR_TrainModelArray + count * 4, model);

Client/game_sa/CPoolsSA.h

@@ -76,7 +76,7 @@ class CPoolsSA : public CPools
     uint           GetModelIdFromClump(RpClump* pRpClump);
 
     // Others
-    CVehicle* AddTrain(CClientVehicle* pClientVehicle, const CVector& vecPosition, std::vector<DWORD> Models, bool bDirection,
+    CVehicle* AddTrain(CClientVehicle* pClientVehicle, const CVector& vecPosition, std::vector<DWORD> models, bool bDirection,
                        std::uint8_t ucTrackId = 255) noexcept;
 
     DWORD GetPedPoolIndex(std::uint8_t* pInterface);

Client/sdk/game/CPools.h

@@ -92,7 +92,7 @@ class CPools
     virtual unsigned long          GetPedCount() = 0;
 
     // Others
-    virtual CVehicle* AddTrain(class CClientVehicle* pClientVehicle, const CVector& vecPosition, std::vector<DWORD> Models, bool iDirection,
+    virtual CVehicle* AddTrain(class CClientVehicle* pClientVehicle, const CVector& vecPosition, std::vector<DWORD> models, bool iDirection,
                                std::uint8_t ucTrackId = 255) noexcept = 0;
 
     virtual CEntity*       GetEntity(DWORD* pGameInterface) = 0;