Commit 5a21ce9a authored by nanahira's avatar nanahira

Merge branch 'develop' into test-miniaudio-se

parents c2e71eef 72f9ec34
......@@ -284,7 +284,7 @@ void SoundManager::PlayMusic(char* song, bool loop) {
return;
if(!IsCurrentlyPlaying(song)) {
StopBGM();
SetSoundVolume(mainGame->gameConf.music_volume);
SetMusicVolume(mainGame->gameConf.music_volume);
#ifdef YGOPRO_USE_MINIAUDIO
strcpy(currentPlayingMusic, song);
#ifdef _WIN32
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment