diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-09-02 21:00:15 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-09-02 21:00:15 +0300 |
| commit | 33abd1b4e7a7b19e2d09c796c481c3325c1e2902 (patch) | |
| tree | 1188818ae1163b02565e091a4b83dad164266a35 /src/audio/AudioManager.h | |
| parent | 6a12033942d8e4421b7fbbad4c55f657cc6427d9 (diff) | |
| parent | a16fcd8d6a79e433c1c6e73d540f1bbe27e14164 (diff) | |
Merge branch 'miami' into lcslcs
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/sampman.h
# src/audio/sampman_miles.cpp
# src/audio/sampman_oal.cpp
Diffstat (limited to 'src/audio/AudioManager.h')
| -rw-r--r-- | src/audio/AudioManager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 23231ece..71c99ff3 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -89,7 +89,7 @@ public: CVector m_vecPos; float m_fDistance; uint8 m_nVolume; - int8 m_nProcess; + int8 m_nLoadingTimeout; // how many iterations we gonna wait until dropping the sample if it's still not loaded (only useful on PS2) #if defined(EXTERNAL_3D_SOUND) && defined(FIX_BUGS) uint8 m_nEmittingVolume; #endif @@ -113,7 +113,7 @@ public: { for (int i = 0; i < NUM_PED_COMMENTS_SLOTS; i++) for (int j = 0; j < NUM_SOUND_QUEUES; j++) { - m_aPedCommentQueue[j][i].m_nProcess = -1; + m_aPedCommentQueue[j][i].m_nLoadingTimeout = -1; m_aPedCommentOrderList[j][i] = NUM_PED_COMMENTS_SLOTS; } @@ -223,7 +223,7 @@ enum { #endif 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 }; +enum LOADING_STATUS { LOADING_STATUS_NOT_LOADED = 0, LOADING_STATUS_LOADED, LOADING_STATUS_LOADING }; class cAudioManager { |