From d5a72fa597e7d0885f7a398e204c4085aff5c241 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Sat, 26 Oct 2019 15:20:12 +0300 Subject: Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode --- src/audio/AudioManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/audio/AudioManager.cpp') diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 1428bb9f..19c994e3 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -582,8 +582,8 @@ cAudioManager::ComputePan(float dist, CVector *vec) return min(107, panTable[index] + 63); } -uint32 -cAudioManager::ComputeVolume(int emittingVolume, float soundIntensity, float distance) const +uint8 +cAudioManager::ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance) const { float newSoundIntensity; if(soundIntensity <= 0.0f) return 0; -- cgit v1.2.3 From 428b407ad5e420dedc7211227de73490a2503d23 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Sat, 26 Oct 2019 16:02:59 +0300 Subject: A bit more enums for ChangeMusicMode --- src/audio/AudioManager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/audio/AudioManager.cpp') 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) { -- cgit v1.2.3