archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-12-20 05:32:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #254 from Sergeanur/Audio

Browse Source 
Audio stuff moved around
This commit is contained in:
Sergeanur
2019-10-26 16:23:04 +03:00
committed by GitHub
parent 28bb221f7e 428b407ad5
commit fd8096aec8
14 changed files with 387 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/audio/AudioManager.cpp
View File

@@ -1,5 +1,6 @@
#include "common.h"
#include "patcher.h"
#include "audio_enums.h"
#include "AudioManager.h"
@@ -582,8 +583,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;
@@ -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) {