diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-18 19:17:24 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-18 19:17:24 +0200 |
| commit | e891cf858f7d2a7c5bbb4ff46400508ffbe3c8b9 (patch) | |
| tree | 90e9c5f9adf97940a464842beb621e20d0967142 /src/audio/MusicManager.cpp | |
| parent | Merge pull request #556 from Fire-Head/master (diff) | |
| download | re3-e891cf858f7d2a7c5bbb4ff46400508ffbe3c8b9.tar re3-e891cf858f7d2a7c5bbb4ff46400508ffbe3c8b9.tar.gz re3-e891cf858f7d2a7c5bbb4ff46400508ffbe3c8b9.tar.bz2 re3-e891cf858f7d2a7c5bbb4ff46400508ffbe3c8b9.tar.lz re3-e891cf858f7d2a7c5bbb4ff46400508ffbe3c8b9.tar.xz re3-e891cf858f7d2a7c5bbb4ff46400508ffbe3c8b9.tar.zst re3-e891cf858f7d2a7c5bbb4ff46400508ffbe3c8b9.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 fd02691e..8e8e9c24 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; @@ -375,7 +373,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; } @@ -676,7 +674,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; } } |