summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-10-12 21:24:58 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-10-12 21:24:58 +0200
commita1700eeaa429e84ac95637652fed2d5719118c6e (patch)
tree37b3028b5d30e0425a957662fed24bad1ff8ab40 /src/vehicles
parentscript 400-499 start (diff)
parentMerge pull request #237 from Nick007J/master (diff)
downloadre3-a1700eeaa429e84ac95637652fed2d5719118c6e.tar
re3-a1700eeaa429e84ac95637652fed2d5719118c6e.tar.gz
re3-a1700eeaa429e84ac95637652fed2d5719118c6e.tar.bz2
re3-a1700eeaa429e84ac95637652fed2d5719118c6e.tar.lz
re3-a1700eeaa429e84ac95637652fed2d5719118c6e.tar.xz
re3-a1700eeaa429e84ac95637652fed2d5719118c6e.tar.zst
re3-a1700eeaa429e84ac95637652fed2d5719118c6e.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Automobile.cpp2
-rw-r--r--src/vehicles/Automobile.h2
-rw-r--r--src/vehicles/Vehicle.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 2329a9d9..12c9c940 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -128,7 +128,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
m_fGasPedal = 0.0f;
m_fBrakePedal = 0.0f;
m_pSetOnFireEntity = nil;
- m_fGasPedalAudio = 0;
+ m_fGasPedalAudio = 0.0f;
bNotDamagedUpsideDown = false;
bMoreResistantToDamage = false;
m_fVelocityChangeForAudio = 0.0f;
diff --git a/src/vehicles/Automobile.h b/src/vehicles/Automobile.h
index 6203957d..534f28a4 100644
--- a/src/vehicles/Automobile.h
+++ b/src/vehicles/Automobile.h
@@ -117,7 +117,7 @@ public:
uint8 m_nWheelsOnGround;
uint8 m_nDriveWheelsOnGround;
uint8 m_nDriveWheelsOnGroundPrev;
- int32 m_fGasPedalAudio;
+ float m_fGasPedalAudio;
tWheelState m_aWheelState[4];
static bool &m_sAllTaxiLights;
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index db0485a9..ffc2ca45 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -266,7 +266,7 @@ public:
bool ShufflePassengersToMakeSpace(void);
bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1; }
- bool IsWrecked(void) { return !this || m_status == STATUS_WRECKED; }
+ bool IsWrecked(void) { return m_status == STATUS_WRECKED; }
CVehicleModelInfo* GetModelInfo() { return (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()); }
static bool &bWheelsOnlyCheat;