summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorFire_Head <Fire-Head@users.noreply.github.com>2019-10-27 04:39:56 +0100
committerGitHub <noreply@github.com>2019-10-27 04:39:56 +0100
commitc39cf2d960ce546c544872a732560b731d8c3897 (patch)
treed7a4b2ec22bcb6a9f6d8ef2602c7fdbac417d18b /src/vehicles
parentControllerConfig done (diff)
parentMerge branch 'master' into master (diff)
downloadre3-c39cf2d960ce546c544872a732560b731d8c3897.tar
re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.gz
re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.bz2
re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.lz
re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.xz
re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.zst
re3-c39cf2d960ce546c544872a732560b731d8c3897.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Vehicle.cpp1
-rw-r--r--src/vehicles/Vehicle.h4
2 files changed, 2 insertions, 3 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 7229992d..3d02dd25 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -15,7 +15,6 @@
#include "PointLights.h"
#include "Renderer.h"
#include "DMAudio.h"
-#include "MusicManager.h"
#include "Radar.h"
bool &CVehicle::bWheelsOnlyCheat = *(bool *)0x95CD78;
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index a30f9842..3046a58f 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -191,7 +191,7 @@ public:
uint8 m_bRainAudioCounter;
uint8 m_bRainSamplesCounter;
uint8 m_nCarHornTimer;
- int8 field_22D;
+ int8 field_22D; // last horn?
bool m_bSirenOrAlarm;
int8 m_comedyControlState;
CStoredCollPoly m_aCollPolys[2]; // poly which is under front/rear part of car
@@ -286,7 +286,7 @@ class cTransmission;
class cVehicleParams
{
public:
- char m_bDistanceCalculated;
+ uint8 m_bDistancECalculated;
char gap_1[3];
float m_fDistance;
CVehicle *m_pVehicle;