diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-12-09 01:31:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 01:31:03 +0100 |
| commit | ac3484b82e0bd286ddd1e56fb566303d7a3ca40d (patch) | |
| tree | f6c95cfd85cb2261f010983f01fd6d62a6de5ef1 /src/core | |
| parent | fix CObject::DeleteAllTempObjectsInArea (diff) | |
| parent | uint8 enums fixed (diff) | |
| download | re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar.gz re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar.bz2 re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar.lz re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar.xz re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar.zst re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/PlayerInfo.h | 4 | ||||
| -rw-r--r-- | src/core/World.cpp | 2 |
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 dc04738a..84722fc5 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 || |