diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-12-09 01:15:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 01:15:20 +0100 |
| commit | 6b654094a5299d55a3621a3a23b6dafbb48b78e9 (patch) | |
| tree | e9735ff0ce34dbfca24bf6c4fc609cbacaac81f1 /src/audio | |
| parent | fix CObject::DeleteAllTempObjectsInArea (diff) | |
| parent | don't cast script param to uint8 (diff) | |
| download | re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar.gz re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar.bz2 re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar.lz re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar.xz re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.tar.zst re3-6b654094a5299d55a3621a3a23b6dafbb48b78e9.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 6 | ||||
| -rw-r--r-- | src/audio/AudioSamples.h | 2 | ||||
| -rw-r--r-- | src/audio/audio_enums.h | 2 | ||||
| -rw-r--r-- | src/audio/soundlist.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 7340e73e..ca395136 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -52,8 +52,8 @@ uint32 gHomeNextTime; uint32 gCellNextTime; uint32 gNextCryTime; -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 @@ -8121,7 +8121,7 @@ cAudioManager::ProcessGarages() const float SOUND_INTENSITY = 80.0f; CEntity *entity; - eGarageState state; + uint8 state; uint32 sampleIndex; uint8 j; float distSquared; diff --git a/src/audio/AudioSamples.h b/src/audio/AudioSamples.h index e2721888..df64521c 100644 --- a/src/audio/AudioSamples.h +++ b/src/audio/AudioSamples.h @@ -2,7 +2,7 @@ #include "common.h" -enum eSfxSample : uint32 +enum eSfxSample { SFX_CAR_HORN_JEEP = 0, SFX_CAR_HORN_BMW328, diff --git a/src/audio/audio_enums.h b/src/audio/audio_enums.h index 20760859..8c6d35aa 100644 --- a/src/audio/audio_enums.h +++ b/src/audio/audio_enums.h @@ -235,7 +235,7 @@ enum AudioEntityHandle { AEHANDLE_ERROR_BADAUDIOTYPE = -1, }; -enum eAudioType : int32 +enum eAudioType { AUDIOTYPE_PHYSICAL = 0, AUDIOTYPE_EXPLOSION, diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h index 225ed56e..7c3b30a7 100644 --- a/src/audio/soundlist.h +++ b/src/audio/soundlist.h @@ -1,6 +1,6 @@ #pragma once -enum eSound : uint16 +enum eSound { SOUND_CAR_DOOR_CLOSE_BONNET = 0, SOUND_CAR_DOOR_CLOSE_BUMPER, @@ -173,7 +173,7 @@ enum eSound : uint16 }; -enum eScriptSounds : uint16 { +enum eScriptSounds { SCRIPT_SOUND_0 = 0, SCRIPT_SOUND_1, SCRIPT_SOUND_2, |