Merge branch 'fh' into sound

gframe/duelclient.cpp

@@ -1104,7 +1104,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				pcard->chain_code = code;
 				mainGame->dField.conti_cards.push_back(pcard);
 				mainGame->dField.conti_act = true;
-				pcard->cmdFlag |= COMMAND_OPERATION;
 			} else {
 				pcard->cmdFlag |= COMMAND_ACTIVATE;
 				if (pcard->location == LOCATION_GRAVE)
@@ -1234,7 +1233,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				pcard->chain_code = code;
 				mainGame->dField.conti_cards.push_back(pcard);
 				mainGame->dField.conti_act = true;
-				pcard->cmdFlag |= COMMAND_OPERATION;
 			} else {
 				pcard->cmdFlag |= COMMAND_ACTIVATE;
 				if (pcard->location == LOCATION_GRAVE)

gframe/game.cpp

@@ -590,6 +590,11 @@ bool Game::Initialize() {
 		chkBotHand = env->addCheckBox(false, rect<s32>(360, 200, 560, 220), tabBot, -1, dataManager.GetSysString(1384));
 		chkBotNoCheckDeck = env->addCheckBox(false, rect<s32>(360, 230, 560, 250), tabBot, -1, dataManager.GetSysString(1229));
 		chkBotNoShuffleDeck = env->addCheckBox(false, rect<s32>(360, 260, 560, 280), tabBot, -1, dataManager.GetSysString(1230));
+	} else { // avoid null pointer
+		btnStartBot = env->addButton(rect<s32>(0, 0, 0, 0), wSinglePlay);
+		btnBotCancel = env->addButton(rect<s32>(0, 0, 0, 0), wSinglePlay);
+		btnStartBot->setVisible(false);
+		btnBotCancel->setVisible(false);
 	}
 	irr::gui::IGUITab* tabSingle = wSingle->addTab(dataManager.GetSysString(1381));
 	lstSinglePlayList = env->addListBox(rect<s32>(10, 10, 350, 350), tabSingle, LISTBOX_SINGLEPLAY_LIST, true);

ocgcore @ 8ffc4947

-Subproject commit 74247b0dd884254a153062c2eada47264246cfbb
+Subproject commit 8ffc49474903e22aa7bc013bdf76dccdc0d04253

script @ 6a41c3e8

-Subproject commit 0abc46fdd0ec78371d79ea352eab2eb4e556cb4a
+Subproject commit 6a41c3e80af4da50ff43a0fddab3c2e5e245314a

strings.conf

@@ -524,6 +524,7 @@
 !counter 0x44 指示物（弹带城壁龙）
 !counter 0x1045 鳞粉指示物
 !counter 0x46 指示物（刚鬼死斗）
+!counter 0x47 指示物（限制代码）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -548,6 +549,7 @@
 !setname 0xd 剑士	セイバー
 !setname 0x100d X-剑士	X－セイバー
 #setname 0x300d XX-剑士	XX－セイバー
+!setname 0x400d 元素灵剑士	エレメントセイバー
 !setname 0xe 电气	エレキ
 !setname 0xf 扰乱	おジャマ
 !setname 0x10 薰风	ガスタ
@@ -878,3 +880,5 @@
 !setname 0x10f 枪管	ヴァレル
 !setname 0x110 眼纳祭神	アイズ・サクリファイス
 !setname 0x111 武装龙	アームド・ドラゴン
+!setname 0x112 幻崩	トロイメア
+!setname 0x113 灵神	霊神