summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-17 23:58:06 +0200
committeraap <aap@papnet.eu>2019-07-17 23:58:06 +0200
commitba242bcf584d885167a9499e53f5bcaf6c9cc866 (patch)
tree29477a626a36462ec3280081388ff1b965be860f /src/vehicles/Vehicle.cpp
parentMerge pull request #145 from guard3/master (diff)
downloadre3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar
re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar.gz
re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar.bz2
re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar.lz
re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar.xz
re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar.zst
re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.zip
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
-rw-r--r--src/vehicles/Vehicle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index f3a8f785..316de7ac 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -35,7 +35,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
int i;
m_nCurrentGear = 0;
- field_208 = 0;
+ m_fChangeGearTime = 0;
m_fSteerRatio = 0.0f;
m_type = ENTITY_TYPE_VEHICLE;
VehicleCreatedBy = CreatedBy;
@@ -380,7 +380,7 @@ CVehicle::ProcessDelayedExplosion(void)
else
m_nBombTimer -= tick;
- if(IsCar() && ((CAutomobile*)this)->m_bombType == 4 && (m_nBombTimer & 0xFE00) != 0xFE00)
+ if(IsCar() && ((CAutomobile*)this)->m_bombType == CARBOMB_TIMEDACTIVE && (m_nBombTimer & 0xFE00) != 0xFE00)
DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_BOMB_TICK, 0.0f);
if (m_nBombTimer != 0)