diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-21 12:32:37 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-21 12:32:37 +0200 |
| commit | 3779a39f1fb745dd6d7ef744fe8312d9e2f1bb48 (patch) | |
| tree | e7aa0175844aa362ad4a00bcde56f3384373e586 | |
| parent | Merge branch 'miami' into lcs (diff) | |
| download | re3-3779a39f1fb745dd6d7ef744fe8312d9e2f1bb48.tar re3-3779a39f1fb745dd6d7ef744fe8312d9e2f1bb48.tar.gz re3-3779a39f1fb745dd6d7ef744fe8312d9e2f1bb48.tar.bz2 re3-3779a39f1fb745dd6d7ef744fe8312d9e2f1bb48.tar.lz re3-3779a39f1fb745dd6d7ef744fe8312d9e2f1bb48.tar.xz re3-3779a39f1fb745dd6d7ef744fe8312d9e2f1bb48.tar.zst re3-3779a39f1fb745dd6d7ef744fe8312d9e2f1bb48.zip | |
| -rw-r--r-- | src/audio/AudioCollision.h | 2 | ||||
| -rw-r--r-- | src/audio/AudioManager.cpp | 2 | ||||
| -rw-r--r-- | src/audio/AudioManager.h | 7 | ||||
| -rw-r--r-- | src/audio/PolRadio.cpp | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/audio/AudioCollision.h b/src/audio/AudioCollision.h index 31be0334..6858aa65 100644 --- a/src/audio/AudioCollision.h +++ b/src/audio/AudioCollision.h @@ -1,6 +1,6 @@ #pragma once -#define NUMAUDIOCOLLISIONS 10 +#define NUMAUDIOCOLLISIONS 14 class CEntity; diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index a2b4a87c..785c23e6 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -527,7 +527,7 @@ cAudioManager::ServiceSoundEffects() ClearRequestedQueue(); InterrogateAudioEntities(); m_sPedComments.Process(); - ServicePoliceRadio(); + //ServicePoliceRadio(); // LCS: removed ServiceCollisions(); AddReleasingSounds(); ProcessMissionAudio(); diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index decd438b..14af25bf 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -119,7 +119,7 @@ public: VALIDATE_SIZE(cPedComments, 0x490); -#define MISSION_AUDIO_SLOTS (2) +#define MISSION_AUDIO_SLOTS (5) // name made up class cAudioScriptObjectManager @@ -241,6 +241,7 @@ public: #endif cAudioScriptObjectManager m_sAudioScriptObjectManager; + bool8 field_4348_lcs; // miami bool8 m_bIsPlayerShutUp; uint8 m_nPlayerMood; @@ -284,6 +285,10 @@ public: bool8 m_nPreviousUserPause; uint32 m_FrameCounter; + uint32 field_5644_lcs; + uint32 field_5648_lcs; + uint8 field_564C_lcs; + cAudioManager(); ~cAudioManager(); diff --git a/src/audio/PolRadio.cpp b/src/audio/PolRadio.cpp index 76161d82..ed884e6e 100644 --- a/src/audio/PolRadio.cpp +++ b/src/audio/PolRadio.cpp @@ -119,6 +119,7 @@ cAudioManager::DoPoliceRadioCrackle() void cAudioManager::ServicePoliceRadio() { + /* int32 wantedLevel = 0; // uninitialized variable static uint32 nLastSeen = 300; @@ -150,6 +151,7 @@ cAudioManager::ServicePoliceRadio() } } ServicePoliceRadioChannel(wantedLevel); + */ } void |