summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-09-14 19:53:04 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-09-14 19:53:04 +0200
commit57f24ad5336594c3355c83c2571ea373f6167a62 (patch)
treef3ff779ddc0716189677d63dfa9ccbc87d2d29c6 /src/vehicles
parentMerge remote-tracking branch 'upstream/master' into carctrl_dev (diff)
downloadre3-57f24ad5336594c3355c83c2571ea373f6167a62.tar
re3-57f24ad5336594c3355c83c2571ea373f6167a62.tar.gz
re3-57f24ad5336594c3355c83c2571ea373f6167a62.tar.bz2
re3-57f24ad5336594c3355c83c2571ea373f6167a62.tar.lz
re3-57f24ad5336594c3355c83c2571ea373f6167a62.tar.xz
re3-57f24ad5336594c3355c83c2571ea373f6167a62.tar.zst
re3-57f24ad5336594c3355c83c2571ea373f6167a62.zip
Diffstat (limited to '')
-rw-r--r--src/vehicles/Vehicle.cpp2
-rw-r--r--src/vehicles/Vehicle.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 8d22606a..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;
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index 0a86d4e5..4c4f1767 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -183,7 +183,7 @@ 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 m_fMapObjectHeightAhead; // front Z?