summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-16 19:48:50 +0200
committeraap <aap@papnet.eu>2019-07-16 19:48:50 +0200
commit36f3a517f9664415b07a4aa537db22159b67a8f2 (patch)
tree967839bbeee586f4f74cbfd630ed9118ad9d84f2 /src/vehicles/Vehicle.h
parentfixed merge (diff)
downloadre3-36f3a517f9664415b07a4aa537db22159b67a8f2.tar
re3-36f3a517f9664415b07a4aa537db22159b67a8f2.tar.gz
re3-36f3a517f9664415b07a4aa537db22159b67a8f2.tar.bz2
re3-36f3a517f9664415b07a4aa537db22159b67a8f2.tar.lz
re3-36f3a517f9664415b07a4aa537db22159b67a8f2.tar.xz
re3-36f3a517f9664415b07a4aa537db22159b67a8f2.tar.zst
re3-36f3a517f9664415b07a4aa537db22159b67a8f2.zip
Diffstat (limited to '')
-rw-r--r--src/vehicles/Vehicle.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index 03bdad69..1f848dc8 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -126,7 +126,7 @@ class CVehicle : public CPhysical
public:
// 0x128
tHandlingData *m_handling;
- CAutoPilot m_autoPilot;
+ CAutoPilot AutoPilot;
uint8 m_currentColour1;
uint8 m_currentColour2;
uint8 m_aExtras[2];
@@ -162,14 +162,14 @@ public:
uint8 bIsBig: 1; // Is this vehicle a bus
uint8 bLowVehicle: 1; // Need this for sporty type cars to use low getting-in/out anims
uint8 bComedyControls : 1; // Will make the car hard to control (hopefully in a funny way)
- uint8 m_veh_flagB20 : 1;
+ uint8 bWarnedPeds : 1; // Has scan and warn peds of danger been processed?
uint8 m_veh_flagB40 : 1;
uint8 m_veh_flagB80 : 1;
uint8 m_veh_flagC1 : 1;
uint8 bIsDamaged : 1; // This vehicle has been damaged and is displaying all its components
- uint8 bHasBeenOwnedByPlayer : 1;
- uint8 m_veh_flagC8 : 1;
+ uint8 bHasBeenOwnedByPlayer : 1;// To work out whether stealing it is a crime
+ uint8 bFadeOut : 1; // Fade vehicle out
uint8 m_veh_flagC10 : 1;
uint8 m_veh_flagC20 : 1;
uint8 bCanBeDamaged : 1; // Set to FALSE during cut scenes to avoid explosions
@@ -196,7 +196,7 @@ public:
uint32 m_nTimeOfDeath;
int16 field_214;
int16 m_nBombTimer; // goes down with each frame
- CPed *m_pWhoSetMeOnFire;
+ CEntity *m_pBlowUpEntity;
float field_21C;
float field_220;
eCarLock m_nDoorLock;