Skip to content

Y
ygopro
Commit 68d78349 authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'master' of https://github.com/Fluorohydride/ygopro

parents aed402e6 29f69c17
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
gframe/sound_manager.cpp
View file @ 68d78349
...@@ -47,6 +47,7 @@ void SoundManager::PlaySoundEffect(int sound) { ...@@ -47,6 +47,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");
...@@ -171,7 +172,6 @@ void SoundManager::PlaySoundEffect(int sound) { ...@@ -171,7 +172,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) {
...@@ -203,8 +203,8 @@ void SoundManager::PlayMusic(char* song, bool loop) { ...@@ -203,8 +203,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
} }
......
strings.conf
View file @ 68d78349
...@@ -977,3 +977,6 @@ ...@@ -977,3 +977,6 @@
!setname 0x130 破械 !setname 0x130 破械
!setname 0x1130 破械神 !setname 0x1130 破械神
!setname 0x131 梦镜 Dream Mirror !setname 0x131 梦镜 Dream Mirror
!setname 0x132 斩机 斬機
!setname 0x133 半龙女仆 ドラゴンメイド
!setname 0x134 王战 ジェネレイド
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