diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-14 19:54:56 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-14 19:54:56 +0200 |
commit | 84186e7b0f15cba33243eab6f15516d3a450b839 (patch) | |
tree | a8dfa4f8ceb65436ab80c1f7ab5aa24f7798dd3c /src/vehicles | |
parent | Merge pull request #206 from erorcun/erorcun (diff) | |
parent | more CCarCtrl (diff) | |
download | re3-84186e7b0f15cba33243eab6f15516d3a450b839.tar re3-84186e7b0f15cba33243eab6f15516d3a450b839.tar.gz re3-84186e7b0f15cba33243eab6f15516d3a450b839.tar.bz2 re3-84186e7b0f15cba33243eab6f15516d3a450b839.tar.lz re3-84186e7b0f15cba33243eab6f15516d3a450b839.tar.xz re3-84186e7b0f15cba33243eab6f15516d3a450b839.tar.zst re3-84186e7b0f15cba33243eab6f15516d3a450b839.zip |
Diffstat (limited to 'src/vehicles')
-rw-r--r-- | src/vehicles/Automobile.cpp | 4 | ||||
-rw-r--r-- | src/vehicles/Vehicle.cpp | 5 | ||||
-rw-r--r-- | src/vehicles/Vehicle.h | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 2ec49710..67d80915 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -3074,7 +3074,7 @@ CAutomobile::PlaceOnRoadProperly(void) frontZ = point.point.z; m_pCurGroundEntity = entity; }else{ - frontZ = field_21C; + frontZ = m_fMapObjectHeightAhead; } CVector rear(GetPosition().x - GetForward().x*lenBack, @@ -3085,7 +3085,7 @@ CAutomobile::PlaceOnRoadProperly(void) rearZ = point.point.z; m_pCurGroundEntity = entity; }else{ - rearZ = field_220; + rearZ = m_fMapObjectHeightBehind; } float len = lenFwd + lenBack; diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 49f21c01..8abba646 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -78,7 +78,7 @@ CVehicle::CVehicle(uint8 CreatedBy) m_veh_flagD1 = false; m_veh_flagD2 = false; m_nGunFiringTime = 0; - field_214 = 0; + m_nTimeBlocked = 0; bLightsOn = false; bVehicleColProcessed = false; m_numPedsUseItAsCover = 0; @@ -90,8 +90,7 @@ CVehicle::CVehicle(uint8 CreatedBy) m_nAlarmState = 0; m_nDoorLock = CARLOCK_UNLOCKED; m_nLastWeaponDamage = -1; - field_220 = 0.0; - field_21C = field_220; + m_fMapObjectHeightAhead = m_fMapObjectHeightBehind = 0.0f; m_audioEntityId = DMAudio.CreateEntity(AUDIOTYPE_PHYSICAL, this); if(m_audioEntityId) DMAudio.SetEntityStatus(m_audioEntityId, true); diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 08f55caa..5eec0d23 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -183,11 +183,11 @@ public: float m_fChangeGearTime; uint32 m_nGunFiringTime; // last time when gun on vehicle was fired (used on boats) uint32 m_nTimeOfDeath; - int16 field_214; + uint16 m_nTimeBlocked; int16 m_nBombTimer; // goes down with each frame CEntity *m_pBlowUpEntity; - float field_21C; // front Z? - float field_220; // rear Z? + float m_fMapObjectHeightAhead; // front Z? + float m_fMapObjectHeightBehind; // rear Z? eCarLock m_nDoorLock; int8 m_nLastWeaponDamage; // see eWeaponType, -1 if no damage int8 m_nRadioStation; |