summaryrefslogtreecommitdiffstats
path: root/src/audio
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/audio
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/audio')
-rw-r--r--src/audio/AudioLogic.cpp4
-rw-r--r--src/audio/AudioManager.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 1ec33054..1ce30755 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -47,8 +47,8 @@ const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples);
const int policeChannel = channels + 1;
const int allChannels = channels + 2;
-enum PLAY_STATUS : uint8 { PLAY_STATUS_STOPPED = 0, PLAY_STATUS_PLAYING, PLAY_STATUS_FINISHED };
-enum LOADING_STATUS : uint8 { LOADING_STATUS_NOT_LOADED = 0, LOADING_STATUS_LOADED, LOADING_STATUS_FAILED };
+enum PLAY_STATUS { PLAY_STATUS_STOPPED = 0, PLAY_STATUS_PLAYING, PLAY_STATUS_FINISHED };
+enum LOADING_STATUS { LOADING_STATUS_NOT_LOADED = 0, LOADING_STATUS_LOADED, LOADING_STATUS_FAILED };
void
cAudioManager::PreInitialiseGameSpecificSetup() const
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 2e0af437..dff7d9c8 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -149,7 +149,7 @@ public:
class cVehicleParams
{
public:
- eVehicleType m_VehicleType;
+ uint8 m_VehicleType;
bool m_bDistanceCalculated;
float m_fDistance;
CVehicle *m_pVehicle;