summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-26 15:02:59 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-26 15:02:59 +0200
commit428b407ad5e420dedc7211227de73490a2503d23 (patch)
treef5457eb1dfcdeafe9def4021b93f1990299279ee /src
parentaudio.h -> audio_enums.h (diff)
downloadre3-428b407ad5e420dedc7211227de73490a2503d23.tar
re3-428b407ad5e420dedc7211227de73490a2503d23.tar.gz
re3-428b407ad5e420dedc7211227de73490a2503d23.tar.bz2
re3-428b407ad5e420dedc7211227de73490a2503d23.tar.lz
re3-428b407ad5e420dedc7211227de73490a2503d23.tar.xz
re3-428b407ad5e420dedc7211227de73490a2503d23.tar.zst
re3-428b407ad5e420dedc7211227de73490a2503d23.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio/AudioManager.cpp5
-rw-r--r--src/core/Frontend.cpp4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 19c994e3..4dc97fae 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -1,5 +1,6 @@
#include "common.h"
#include "patcher.h"
+#include "audio_enums.h"
#include "AudioManager.h"
@@ -7128,14 +7129,14 @@ cAudioManager::ProcessSpecial()
{
if(m_bUserPause) {
if(!m_bPreviousUserPause) {
- MusicManager.ChangeMusicMode(0);
+ MusicManager.ChangeMusicMode(MUSICMODE_FRONTEND);
SampleManager.SetEffectsFadeVolume(maxVolume);
SampleManager.SetMusicFadeVolume(maxVolume);
}
} else {
if(m_bPreviousUserPause) {
MusicManager.StopFrontEndTrack();
- MusicManager.ChangeMusicMode(1);
+ MusicManager.ChangeMusicMode(MUSICMODE_GAME);
}
CPlayerPed *playerPed = FindPlayerPed();
if(playerPed) {
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 6ba6d5c8..5f87049a 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1085,7 +1085,7 @@ void CMenuManager::LoadAllTextures()
{
if (!m_bSpritesLoaded) {
CMenuManager::CentreMousePointer();
- DMAudio.ChangeMusicMode(0);
+ DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
m_nCurrOption = 0;
m_PrefsRadioStation = DMAudio.GetRadioInCar();
@@ -2132,7 +2132,7 @@ WRAPPER void CMenuManager::RequestFrontEndShutdown() { EAXJMP(0x488750); }
void CMenuManager::RequestFrontEndShutdown()
{
m_bShutDownFrontEndRequested = true;
- DMAudio.ChangeMusicMode(1);
+ DMAudio.ChangeMusicMode(MUSICMODE_GAME);
}
#endif