summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorNikolay <nickvnuk@gmail.com>2021-02-05 23:04:06 +0100
committerGitHub <noreply@github.com>2021-02-05 23:04:06 +0100
commit410eb19ce6a116fd61d4a35087b4cf13b3a4850f (patch)
tree30d93d6f5c33987f4c52ed137165cb8c31863368 /src/vehicles
parentMerge pull request #997 from Fire-Head/lcs (diff)
parentfix (diff)
downloadre3-410eb19ce6a116fd61d4a35087b4cf13b3a4850f.tar
re3-410eb19ce6a116fd61d4a35087b4cf13b3a4850f.tar.gz
re3-410eb19ce6a116fd61d4a35087b4cf13b3a4850f.tar.bz2
re3-410eb19ce6a116fd61d4a35087b4cf13b3a4850f.tar.lz
re3-410eb19ce6a116fd61d4a35087b4cf13b3a4850f.tar.xz
re3-410eb19ce6a116fd61d4a35087b4cf13b3a4850f.tar.zst
re3-410eb19ce6a116fd61d4a35087b4cf13b3a4850f.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Bike.cpp2
-rw-r--r--src/vehicles/Bike.h1
-rw-r--r--src/vehicles/Vehicle.cpp1
-rw-r--r--src/vehicles/Vehicle.h6
4 files changed, 7 insertions, 3 deletions
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp
index 6ad59769..f8ef4746 100644
--- a/src/vehicles/Bike.cpp
+++ b/src/vehicles/Bike.cpp
@@ -134,6 +134,8 @@ CBike::CBike(int32 id, uint8 CreatedBy)
bIsOnFire = false;
bWheelieCam = false;
+ bFixedColour = false; // <- figure out actual place (TODO)
+
m_fTireTemperature = 1.0f;
m_fBrakeDestabilization = 0.0f;
m_fVelocityChangeForAudio = 0;
diff --git a/src/vehicles/Bike.h b/src/vehicles/Bike.h
index 219d8872..611cd11d 100644
--- a/src/vehicles/Bike.h
+++ b/src/vehicles/Bike.h
@@ -75,6 +75,7 @@ public:
uint8 bExtraSpeed : 1; // leaning forward
uint8 bIsOnFire : 1;
uint8 bWheelieCam : 1;
+ uint8 bFixedColour : 1; // <- figure out its actual place (TODO)
int16 m_doingBurnout;
float m_fTireTemperature;
float m_fBrakeDestabilization;
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index a3d07d5c..67acf47d 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -133,6 +133,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
bCreatedAsPoliceVehicle = false;
bRestingOnPhysical = false;
bParking = false;
+ m_bGarageTurnedLightsOff = false;
bCanPark = CGeneral::GetRandomNumberInRange(0.0f, 1.0f) < 0.0f; // never true. probably doesn't work very well
bIsVan = false;
bIsBus = false;
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index cebafd77..450f1c3b 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -240,17 +240,17 @@ public:
uint8 bRestingOnPhysical : 1; // Dont go static cause car is sitting on a physical object that might get removed
uint8 bParking : 1;
uint8 bCanPark : 1;
-#if (!defined GTA_PS2 || defined FIX_BUGS)
+#if (!defined GTA_PS2 || defined FIX_BUGS) // <- I think this can be moved back to CAutomobile?
uint8 m_bombType : 3;
#endif
uint8 bDriverLastFrame : 1;
-
- uint8 bAllowGarageToStore : 1; // <- many LCS flags before
+ uint8 bRewardVehicle : 1; // 25B_40
int8 m_numPedsUseItAsCover;
uint8 m_nAmmoInClip; // Used to make the guns on boat do a reload (20 by default)
int8 m_nPacManPickupsCarried;
uint8 m_nRoadblockType;
+ bool m_bGarageTurnedLightsOff;
float m_fHealth; // 1000.0f = full health. 250.0f = fire. 0 -> explode
float m_fEngineEnergy; // TODO(LCS): better name. it adds up acceleration force, so possibly kinetic energy??
uint8 m_nCurrentGear;