diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-20 13:39:36 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-20 13:39:36 +0200 |
| commit | c53b23cff026e72bca295495ab0bc9c20a18c599 (patch) | |
| tree | 172de606bc1a2e203f8ee5933a47e26370f90668 /src/audio/MusicManager.cpp | |
| parent | Merge pull request #569 from aap/miami (diff) | |
| parent | fixed script bug (diff) | |
| download | re3-c53b23cff026e72bca295495ab0bc9c20a18c599.tar re3-c53b23cff026e72bca295495ab0bc9c20a18c599.tar.gz re3-c53b23cff026e72bca295495ab0bc9c20a18c599.tar.bz2 re3-c53b23cff026e72bca295495ab0bc9c20a18c599.tar.lz re3-c53b23cff026e72bca295495ab0bc9c20a18c599.tar.xz re3-c53b23cff026e72bca295495ab0bc9c20a18c599.tar.zst re3-c53b23cff026e72bca295495ab0bc9c20a18c599.zip | |
Diffstat (limited to 'src/audio/MusicManager.cpp')
| -rw-r--r-- | src/audio/MusicManager.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 841573a9..afe31bf0 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -21,8 +21,6 @@ int32 gNumRetunePresses; int32 gRetuneCounter; bool bHasStarted; -const int maxVolume = 127; - cMusicManager::cMusicManager() { m_bIsInitialised = false; @@ -376,7 +374,7 @@ cMusicManager::Service() if (!m_bIsInitialised || m_bDisabled) return; if (m_nMusicMode == MUSICMODE_CUTSCENE) { - SampleManager.SetStreamedVolumeAndPan(maxVolume, 63, 1, 0); + SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, 1, 0); return; } @@ -677,7 +675,7 @@ cMusicManager::PreloadCutSceneMusic(uint8 track) while (SampleManager.IsStreamPlaying(0)) SampleManager.StopStreamedFile(0); SampleManager.PreloadStreamedFile(track, 0); - SampleManager.SetStreamedVolumeAndPan(maxVolume, 63, 1, 0); + SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, 1, 0); m_nCurrentStreamedSound = track; } } |