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

gframe/sound_manager.cpp

@@ -47,6 +47,7 @@ void SoundManager::PlaySoundEffect(int sound) {
 #ifdef YGOPRO_USE_IRRKLANG
 	if(!mainGame->chkEnableSound->isChecked())
 		return;
+	engineSound->setSoundVolume(mainGame->gameConf.sound_volume);
 	switch(sound) {
 	case SOUND_SUMMON: {
 		engineSound->play2D("./sound/summon.wav");
@@ -171,7 +172,6 @@ void SoundManager::PlaySoundEffect(int sound) {
 	default:
 		break;
 	}
-	engineSound->setSoundVolume(mainGame->gameConf.sound_volume);
 #endif
 }
 void SoundManager::PlayDialogSound(irr::gui::IGUIElement * element) {
@@ -203,8 +203,8 @@ void SoundManager::PlayMusic(char* song, bool loop) {
 		return;
 	if(!engineMusic->isCurrentlyPlaying(song)) {
 		engineMusic->stopAllSounds();
-		soundBGM = engineMusic->play2D(song, loop, false, true);
 		engineMusic->setSoundVolume(mainGame->gameConf.music_volume);
+		soundBGM = engineMusic->play2D(song, loop, false, true);
 	}
 #endif
 }

strings.conf

@@ -977,3 +977,6 @@
 !setname 0x130 破械
 !setname 0x1130 破械神
 !setname 0x131 梦镜	Dream Mirror
+!setname 0x132 斩机	斬機
+!setname 0x133 半龙女仆	ドラゴンメイド
+!setname 0x134 王战	ジェネレイド