summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-22 23:58:59 +0200
committeraap <aap@papnet.eu>2020-05-22 23:58:59 +0200
commita1e4b15bcc93fa814a63e1b6ccdca50197874e5c (patch)
treef54f09c8a5f002d64ed81a2f6a7e9024d9028612 /src/vehicles/Vehicle.h
parentCPhysical (diff)
parentMerge pull request #576 from Nick007J/miami (diff)
downloadre3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar
re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar.gz
re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar.bz2
re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar.lz
re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar.xz
re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar.zst
re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.zip
Diffstat (limited to 'src/vehicles/Vehicle.h')
-rw-r--r--src/vehicles/Vehicle.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index a401975c..8673de8f 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -183,11 +183,11 @@ public:
uint8 bIsCarParkVehicle : 1; // Car has been created using the special CAR_PARK script command
uint8 bHasAlreadyBeenRecorded : 1; // Used for replays
uint8 bPartOfConvoy : 1;
- //uint8 bHeliMinimumTilt : 1; // This heli should have almost no tilt really
+ uint8 bHeliMinimumTilt : 1; // This heli should have almost no tilt really
//uint8 bAudioChangingGear : 1; // sounds like vehicle is changing gear
uint8 bIsDrowning : 1; // is vehicle occupants taking damage in water (i.e. vehicle is dead in water)
- //uint8 bTyresDontBurst : 1; // If this is set the tyres are invincible
+ uint8 bTyresDontBurst : 1; // If this is set the tyres are invincible
uint8 bCreatedAsPoliceVehicle : 1;// True if this guy was created as a police vehicle (enforcer, policecar, miamivice car etc)
uint8 bRestingOnPhysical : 1; // Dont go static cause car is sitting on a physical object that might get removed
uint8 bParking : 1;
@@ -318,6 +318,7 @@ public:
#endif
static bool m_bDisableMouseSteering;
static bool bDisableRemoteDetonation;
+ static bool bDisableRemoteDetonationOnContact;
};
void DestroyVehicleAndDriverAndPassengers(CVehicle* pVehicle);