summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2020-12-07 01:59:17 +0100
committerwithmorten <morten.with@gmail.com>2020-12-07 01:59:17 +0100
commit4c0744260d2a7c1d9e015359edc58affb975fa03 (patch)
tree2d32e1f4658266e39c65937c1197c7277f51a487 /src/core
parentint8 enums fixed (diff)
downloadre3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.gz
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.bz2
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.lz
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.xz
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.zst
re3-4c0744260d2a7c1d9e015359edc58affb975fa03.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/PlayerInfo.h4
-rw-r--r--src/core/World.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/PlayerInfo.h b/src/core/PlayerInfo.h
index 7d99a4e0..68a50c82 100644
--- a/src/core/PlayerInfo.h
+++ b/src/core/PlayerInfo.h
@@ -10,7 +10,7 @@ enum eWastedBustedState
WBSTATE_FAILED_CRITICAL_MISSION,
};
-enum eBustedAudioState : uint8
+enum eBustedAudioState
{
BUSTEDAUDIO_NONE,
BUSTEDAUDIO_LOADING,
@@ -82,7 +82,7 @@ public:
bool m_bGetOutOfJailFree;
bool m_bGetOutOfHospitalFree;
bool m_bDriveByAllowed;
- eBustedAudioState m_nBustedAudioStatus;
+ uint8 m_nBustedAudioStatus;
int16 m_nCurrentBustedAudio;
char m_aSkinName[32];
RwTexture *m_pSkinTexture;
diff --git a/src/core/World.cpp b/src/core/World.cpp
index bc104fe9..1d96163c 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -1580,7 +1580,7 @@ CWorld::CallOffChaseForAreaSectorListVehicles(CPtrList &list, float x1, float y1
if(pVehicle->m_scanCode != GetCurrentScanCode()) {
pVehicle->m_scanCode = GetCurrentScanCode();
const CVector &vehiclePos = pVehicle->GetPosition();
- eCarMission carMission = pVehicle->AutoPilot.m_nCarMission;
+ uint8 carMission = pVehicle->AutoPilot.m_nCarMission;
if(pVehicle != FindPlayerVehicle() && vehiclePos.x > fStartX && vehiclePos.x < fEndX &&
vehiclePos.y > fStartY && vehiclePos.y < fEndY && pVehicle->bIsLawEnforcer &&
(carMission == MISSION_RAMPLAYER_FARAWAY || carMission == MISSION_RAMPLAYER_CLOSE ||