summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-17 20:43:11 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-17 20:43:11 +0200
commita5b84eb9fe32689f0aee10077854a3652c986c08 (patch)
treec8e5e5c72db293ca86bdadbc023f3997b05df947 /src/vehicles/Vehicle.cpp
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
downloadre3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar
re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.gz
re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.bz2
re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.lz
re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.xz
re3-a5b84eb9fe32689f0aee10077854a3652c986c08.tar.zst
re3-a5b84eb9fe32689f0aee10077854a3652c986c08.zip
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
-rw-r--r--src/vehicles/Vehicle.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index df8c71b0..2fdc298f 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -29,6 +29,7 @@ bool CVehicle::bCheat5;
bool CVehicle::bAltDodoCheat;
#endif
bool CVehicle::m_bDisableMouseSteering = true;
+bool CVehicle::bDisableRemoteDetonation;
void *CVehicle::operator new(size_t sz) { return CPools::GetVehiclePool()->New(); }
void *CVehicle::operator new(size_t sz, int handle) { return CPools::GetVehiclePool()->New(handle); }
@@ -1353,14 +1354,14 @@ eVehicleAppearance
CVehicle::GetVehicleAppearance(void)
{
if (IsCar())
- return VEHICLE_CAR;
+ return VEHICLE_APPEARANCE_CAR;
if (IsBoat())
- return VEHICLE_BOAT;
+ return VEHICLE_APPEARANCE_BOAT;
if (IsBike())
- return VEHICLE_BIKE;
+ return VEHICLE_APPEARANCE_BIKE;
if (IsPlane())
- return VEHICLE_PLANE;
+ return VEHICLE_APPEARANCE_PLANE;
if (IsHeli())
- return VEHICLE_HELI;
- return VEHICLE_NONE;
+ return VEHICLE_APPEARANCE_HELI;
+ return VEHICLE_APPEARANCE_NONE;
}