@@ -1020,11 +1020,14 @@ CVector CModelInfoSA::GetVehicleDummyDefaultPosition(eVehicleDummies eDummy)
1020
1020
}
1021
1021
}
1022
1022
1023
- if (!IsLoaded ())
1024
- Request (BLOCKING, " GetVehicleDummyDefaultPosition" );
1023
+ ModelAddRef (BLOCKING, " GetVehicleDummyDefaultPosition" );
1024
+
1025
+ auto modelInfo = reinterpret_cast <CVehicleModelInfoSAInterface*>(GetInterface ());
1026
+ CVector vec = modelInfo->pVisualInfo ->vecDummies [eDummy];
1027
+
1028
+ RemoveRef ();
1025
1029
1026
- auto modelInfo = reinterpret_cast <CVehicleModelInfoSAInterface*>(m_pInterface);
1027
- return modelInfo->pVisualInfo ->vecDummies [eDummy];
1030
+ return vec;
1028
1031
}
1029
1032
1030
1033
CVector CModelInfoSA::GetVehicleDummyPosition (eVehicleDummies eDummy)
@@ -1108,11 +1111,7 @@ float CModelInfoSA::GetVehicleWheelSize(eResizableVehicleWheelGroup eWheelGroup)
1108
1111
if (!IsVehicle ())
1109
1112
return 0 .0f ;
1110
1113
1111
- // Request model load right now if not loaded yet
1112
- if (!IsLoaded ())
1113
- Request (BLOCKING, " GetVehicleWheelSize" );
1114
-
1115
- auto pVehicleModel = reinterpret_cast <CVehicleModelInfoSAInterface*>(m_pInterface);
1114
+ auto pVehicleModel = reinterpret_cast <CVehicleModelInfoSAInterface*>(GetInterface ());
1116
1115
switch (eWheelGroup)
1117
1116
{
1118
1117
case eResizableVehicleWheelGroup::FRONT_AXLE:
@@ -1129,11 +1128,7 @@ void CModelInfoSA::SetVehicleWheelSize(eResizableVehicleWheelGroup eWheelGroup,
1129
1128
if (!IsVehicle ())
1130
1129
return ;
1131
1130
1132
- // Request model load right now if not loaded yet
1133
- if (!IsLoaded ())
1134
- Request (BLOCKING, " SetVehicleWheelSize" );
1135
-
1136
- auto pVehicleModel = reinterpret_cast <CVehicleModelInfoSAInterface*>(m_pInterface);
1131
+ auto pVehicleModel = reinterpret_cast <CVehicleModelInfoSAInterface*>(GetInterface ());
1137
1132
1138
1133
// Store default wheel sizes in map
1139
1134
if (!MapFind (ms_VehicleModelDefaultWheelSizes, m_dwModelID))
0 commit comments