Skip to content

Y
ygopro-2pick
Commit 86771e28 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents ba8be091 39dc2fd4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
gframe/sound_manager.cpp
View file @ 86771e28
...@@ -52,6 +52,7 @@ void SoundManager::PlaySoundEffect(int sound) { ...@@ -52,6 +52,7 @@ void SoundManager::PlaySoundEffect(int sound) {
#ifdef YGOPRO_USE_IRRKLANG #ifdef YGOPRO_USE_IRRKLANG
if(!mainGame->chkEnableSound->isChecked()) if(!mainGame->chkEnableSound->isChecked())
return; return;
engineSound->setSoundVolume(mainGame->gameConf.sound_volume);
switch(sound) { switch(sound) {
case SOUND_SUMMON: { case SOUND_SUMMON: {
engineSound->play2D("./sound/summon.wav"); engineSound->play2D("./sound/summon.wav");
...@@ -180,7 +181,6 @@ void SoundManager::PlaySoundEffect(int sound) { ...@@ -180,7 +181,6 @@ void SoundManager::PlaySoundEffect(int sound) {
default: default:
break; break;
} }
engineSound->setSoundVolume(mainGame->gameConf.sound_volume);
#endif #endif
} }
void SoundManager::PlayDialogSound(irr::gui::IGUIElement * element) { void SoundManager::PlayDialogSound(irr::gui::IGUIElement * element) {
...@@ -212,8 +212,8 @@ void SoundManager::PlayMusic(char* song, bool loop) { ...@@ -212,8 +212,8 @@ void SoundManager::PlayMusic(char* song, bool loop) {
return; return;
if(!engineMusic->isCurrentlyPlaying(song)) { if(!engineMusic->isCurrentlyPlaying(song)) {
engineMusic->stopAllSounds(); engineMusic->stopAllSounds();
soundBGM = engineMusic->play2D(song, loop, false, true);
engineMusic->setSoundVolume(mainGame->gameConf.music_volume); engineMusic->setSoundVolume(mainGame->gameConf.music_volume);
soundBGM = engineMusic->play2D(song, loop, false, true);
} }
#endif #endif
} }
...@@ -257,8 +257,8 @@ void SoundManager::PlayCustomSound(char* SoundName) { ...@@ -257,8 +257,8 @@ void SoundManager::PlayCustomSound(char* SoundName) {
#ifdef YGOPRO_USE_IRRKLANG #ifdef YGOPRO_USE_IRRKLANG
if(!mainGame->chkEnableSound->isChecked()) if(!mainGame->chkEnableSound->isChecked())
return; return;
engineSound->play2D(SoundName);
engineSound->setSoundVolume(mainGame->gameConf.sound_volume); engineSound->setSoundVolume(mainGame->gameConf.sound_volume);
engineSound->play2D(SoundName);
#endif #endif
} }
void SoundManager::StopBGM() { void SoundManager::StopBGM() {
......
ocgcore @ 8394ad37
Subproject commit 0ba949b0cbeb78c619bb1179d3371ff1c108f808 Subproject commit 8394ad378997ed3ae8d262acd00c32d21ba11eb1
script @ 93ac2a46
Subproject commit 7e2e5d4d4eaf792efb65acd5c426ecb1eb4be6f8 Subproject commit 93ac2a46d32b5849c87aa7ee8241ea774cb9e1ef
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