Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

A bit more enums for ChangeMusicMode

Browse Source
This commit is contained in:
Sergeanur 2019-10-26 16:02:59 +03:00
parent 8fb71e2555
commit 428b407ad5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/audio/AudioManager.cpp
View File

@ -1,5 +1,6 @@
#include "common.h" #include "common.h"
#include "patcher.h" #include "patcher.h"
#include "audio_enums.h"
#include "AudioManager.h" #include "AudioManager.h"
@ -7128,14 +7129,14 @@ cAudioManager::ProcessSpecial()
{ {
if(m_bUserPause) { if(m_bUserPause) {
if(!m_bPreviousUserPause) { if(!m_bPreviousUserPause) {
MusicManager.ChangeMusicMode(0); MusicManager.ChangeMusicMode(MUSICMODE_FRONTEND);
SampleManager.SetEffectsFadeVolume(maxVolume); SampleManager.SetEffectsFadeVolume(maxVolume);
SampleManager.SetMusicFadeVolume(maxVolume); SampleManager.SetMusicFadeVolume(maxVolume);
} }
} else { } else {
if(m_bPreviousUserPause) { if(m_bPreviousUserPause) {
MusicManager.StopFrontEndTrack(); MusicManager.StopFrontEndTrack();
MusicManager.ChangeMusicMode(1); MusicManager.ChangeMusicMode(MUSICMODE_GAME);
} }
CPlayerPed *playerPed = FindPlayerPed(); CPlayerPed *playerPed = FindPlayerPed();
if(playerPed) { if(playerPed) {

4
src/core/Frontend.cpp
View File

@ -1085,7 +1085,7 @@ void CMenuManager::LoadAllTextures()
{ {
if (!m_bSpritesLoaded) { if (!m_bSpritesLoaded) {
CMenuManager::CentreMousePointer(); CMenuManager::CentreMousePointer();
DMAudio.ChangeMusicMode(0); DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0); DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
m_nCurrOption = 0; m_nCurrOption = 0;
m_PrefsRadioStation = DMAudio.GetRadioInCar(); m_PrefsRadioStation = DMAudio.GetRadioInCar();
@ -2132,7 +2132,7 @@ WRAPPER void CMenuManager::RequestFrontEndShutdown() { EAXJMP(0x488750); }
void CMenuManager::RequestFrontEndShutdown() void CMenuManager::RequestFrontEndShutdown()
{ {
m_bShutDownFrontEndRequested = true; m_bShutDownFrontEndRequested = true;
DMAudio.ChangeMusicMode(1); DMAudio.ChangeMusicMode(MUSICMODE_GAME);
} }
#endif #endif