diff options
| author | aap <aap@papnet.eu> | 2021-01-25 10:30:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 10:30:34 +0100 |
| commit | d6544933aaa391072178532dbb6872d0e3c479f8 (patch) | |
| tree | 8d924704b6f622bb50275ca1565b55a51e8cfb62 /src/vehicles | |
| parent | Add cmake option for sanitizers (diff) | |
| parent | CVehicleModelInfo (diff) | |
| download | re3-d6544933aaa391072178532dbb6872d0e3c479f8.tar re3-d6544933aaa391072178532dbb6872d0e3c479f8.tar.gz re3-d6544933aaa391072178532dbb6872d0e3c479f8.tar.bz2 re3-d6544933aaa391072178532dbb6872d0e3c479f8.tar.lz re3-d6544933aaa391072178532dbb6872d0e3c479f8.tar.xz re3-d6544933aaa391072178532dbb6872d0e3c479f8.tar.zst re3-d6544933aaa391072178532dbb6872d0e3c479f8.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Heli.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index a4d9e5c3..6d6b4833 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -4174,7 +4174,7 @@ CAutomobile::dmgDrawCarCollidingParticles(const CVector &pos, float amount) CGeneral::GetRandomNumberInRange(0.1f, 0.25f)), nil, CGeneral::GetRandomNumberInRange(0.02f, 0.08f), - CVehicleModelInfo::ms_vehicleColourTable[m_currentColour1], + CVehicleModelInfo::mspInfo->ms_vehicleColourTable[m_currentColour1], CGeneral::GetRandomNumberInRange(-40.0f, 40.0f), 0, CGeneral::GetRandomNumberInRange(0.0f, 4.0f)); diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp index 38550c38..0546888a 100644 --- a/src/vehicles/Heli.cpp +++ b/src/vehicles/Heli.cpp @@ -756,7 +756,7 @@ CHeli::InitHelis(void) for(i = 0; i < NUM_HELIS; i++) pHelis[i] = nil; - ((CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_CHOPPER))->SetColModel(&CTempColModels::ms_colModelPed1); + ((CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_CHOPPER))->SetColModel(&gpTempColModels->ms_colModelPed1); } CHeli* diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 1b4e7581..a3d07d5c 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -217,8 +217,8 @@ void CVehicle::SetModelIndex(uint32 id) { CEntity::SetModelIndex(id); - m_aExtras[0] = CVehicleModelInfo::ms_compsUsed[0]; - m_aExtras[1] = CVehicleModelInfo::ms_compsUsed[1]; + m_aExtras[0] = CVehicleModelInfo::mspInfo->ms_compsUsed[0]; + m_aExtras[1] = CVehicleModelInfo::mspInfo->ms_compsUsed[1]; m_nNumMaxPassengers = CVehicleModelInfo::GetMaximumNumberOfPassengersFromNumberOfDoors(id); } |