Skip to content

Commit be5ffb3

Browse files
committed
Fix the Adlib music volume after OpenXcom#1234
1 parent c7e1397 commit be5ffb3

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

‎src/Engine/AdlibMusic.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,8 @@ void AdlibMusic::play(int) const
140140
void AdlibMusic::player(void *udata, Uint8 *stream, int len)
141141
{
142142
#ifndef __NO_MUSIC
143-
// Read from SDL instead of Options for Background Mute functionality
144-
int musicVolume = Mix_VolumeMusic(-1);
145-
if (musicVolume == 0)
143+
// Check SDL volume for Background Mute functionality
144+
if (Options::musicVolume == 0 || Mix_VolumeMusic(-1) == 0)
146145
return;
147146
if (Options::musicAlwaysLoop && !func_is_music_playing())
148147
{
@@ -157,7 +156,7 @@ void AdlibMusic::player(void *udata, Uint8 *stream, int len)
157156
int i = std::min(delay, len);
158157
if (i)
159158
{
160-
float volume = Game::volumeExponent(musicVolume);
159+
float volume = Game::volumeExponent(Options::musicVolume);
161160
YM3812UpdateOne(opl[0], (INT16*)stream, i / 2, 2, volume);
162161
YM3812UpdateOne(opl[1], ((INT16*)stream) + 1, i / 2, 2, volume);
163162
stream += i;

0 commit comments

Comments
 (0)