diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-22 17:47:14 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-22 17:47:14 +0100 |
| commit | 861506d048b7c4370f066e62233448979824bd68 (patch) | |
| tree | caa435843c73aab13174a3b63bfb6dd759a9df73 /src/audio/MusicManager.cpp | |
| parent | missing endlines (diff) | |
| parent | Remove all constexpr (diff) | |
| download | re3-861506d048b7c4370f066e62233448979824bd68.tar re3-861506d048b7c4370f066e62233448979824bd68.tar.gz re3-861506d048b7c4370f066e62233448979824bd68.tar.bz2 re3-861506d048b7c4370f066e62233448979824bd68.tar.lz re3-861506d048b7c4370f066e62233448979824bd68.tar.xz re3-861506d048b7c4370f066e62233448979824bd68.tar.zst re3-861506d048b7c4370f066e62233448979824bd68.zip | |
Diffstat (limited to 'src/audio/MusicManager.cpp')
| -rw-r--r-- | src/audio/MusicManager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 5b94514b..1fac8a23 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -21,6 +21,8 @@ uint8 &cDisplay = *(uint8 *)0x650BA1; int32 &gRetuneCounter = *(int32*)0x650B84; bool& bHasStarted = *(bool*)0x650B7C; +const int maxVolume = 127; + cMusicManager::cMusicManager() { m_bIsInitialised = false; @@ -365,7 +367,7 @@ cMusicManager::Service() if (!m_bIsInitialised || m_bDisabled) return; if (m_nMusicMode == MUSICMODE_CUTSCENE) { - SampleManager.SetStreamedVolumeAndPan(AudioManager.maxVolume, 63, 1, 0); + SampleManager.SetStreamedVolumeAndPan(maxVolume, 63, 1, 0); return; } @@ -666,7 +668,7 @@ cMusicManager::PreloadCutSceneMusic(uint8 track) while (SampleManager.IsStreamPlaying(0)) SampleManager.StopStreamedFile(0); SampleManager.PreloadStreamedFile(track, 0); - SampleManager.SetStreamedVolumeAndPan(AudioManager.maxVolume, 63, 1, 0); + SampleManager.SetStreamedVolumeAndPan(maxVolume, 63, 1, 0); m_nCurrentStreamedSound = track; } } |