Merge branch 'master' into another

gframe/game.cpp

@@ -116,7 +116,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro Another %X.0%X.%X Rosarium", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro Another %X.0%X.%X Charin", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

gframe/sound_manager.cpp

@@ -52,6 +52,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");
@@ -180,7 +181,6 @@ void SoundManager::PlaySoundEffect(int sound) {
 	default:
 		break;
 	}
-	engineSound->setSoundVolume(mainGame->gameConf.sound_volume);
 #endif
 }
 void SoundManager::PlayDialogSound(irr::gui::IGUIElement * element) {
@@ -212,8 +212,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
 }
@@ -257,8 +257,8 @@ void SoundManager::PlayCustomSound(char* SoundName) {
 #ifdef YGOPRO_USE_IRRKLANG
 	if(!mainGame->chkEnableSound->isChecked())
 		return;
-	engineSound->play2D(SoundName);
 	engineSound->setSoundVolume(mainGame->gameConf.sound_volume);
+	engineSound->play2D(SoundName);
 #endif
 }
 void SoundManager::StopBGM() {

ocgcore @ a863a19d

-Subproject commit 0ba949b0cbeb78c619bb1179d3371ff1c108f808
+Subproject commit a863a19d260bc343484ea0911c5f7a72fe9d6a87

premake/gframe/ygopro.rc

@@ -16,8 +16,8 @@ VALUE "InternalName", "KoishiPro Another"
 VALUE "LegalCopyright", "Copyright (C) 2019 Nanahira"
 VALUE "OriginalFilename", "ygopro_another.exe"
 VALUE "ProductName", "KoishiPro Another"
-VALUE "FileVersion", "Rosarium"
-VALUE "ProductVersion", "Rosarium"
+VALUE "FileVersion", "Charin"
+VALUE "ProductVersion", "Charin"
 END
 END
 BLOCK "VarFileInfo"

script @ 1d99403a

-Subproject commit 7e2e5d4d4eaf792efb65acd5c426ecb1eb4be6f8
+Subproject commit 1d99403acb4527402a1cf53c6a70ce1af6bdb479

strings.conf

@@ -1007,3 +1007,6 @@
 !setname 0x130 破械
 !setname 0x1130 破械神
 !setname 0x131 梦镜	Dream Mirror
+!setname 0x132 斩机
+!setname 0x133 半龙女仆
+!setname 0x134 王战