Merge branch 'fh' into sound

gframe/deck_con.cpp

@@ -220,6 +220,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					if(mainGame->chkCategory[i]->isChecked())
 						filter_effect |= filter;
 				mainGame->HideElement(mainGame->wCategories);
+				InstantSearch();
 				break;
 			}
 			case BUTTON_SIDE_OK: {
@@ -312,6 +313,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				if (mainGame->btnMark[7]->isPressed())
 					filter_marks |= 0004;
 				mainGame->HideElement(mainGame->wLinkMarks);
+				InstantSearch();
 				break;
 			}
 			}
@@ -332,8 +334,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 		case irr::gui::EGET_EDITBOX_CHANGED: {
 			switch(id) {
 			case EDITBOX_KEYWORD: {
-				if(mainGame->gameConf.auto_search_limit >= 0 && (wcslen(mainGame->ebCardName->getText()) >= mainGame->gameConf.auto_search_limit))
-					StartFilter();
+				InstantSearch();
 				break;
 			}
 			}
@@ -451,6 +452,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					break;
 				}
 				}
+				InstantSearch();
 				break;
 			}
 			case COMBOBOX_SORTTYPE: {
@@ -467,8 +469,13 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 						mainGame->ebDefense->setEnabled(true);
 					}
 				}
+				InstantSearch();
 				break;
 			}
+			case COMBOBOX_ATTRIBUTE:
+			case COMBOBOX_RACE:
+			case COMBOBOX_LIMIT:
+				InstantSearch();
 			}
 		}
 		default: break;
@@ -865,6 +872,10 @@ void DeckBuilder::FilterCards() {
 	}
 	SortList();
 }
+void DeckBuilder::InstantSearch() {
+	if(mainGame->gameConf.auto_search_limit >= 0 && (wcslen(mainGame->ebCardName->getText()) >= mainGame->gameConf.auto_search_limit))
+		StartFilter();
+}
 void DeckBuilder::ClearSearch() {
 	mainGame->cbCardType->setSelected(0);
 	mainGame->cbCardType2->setSelected(0);

gframe/deck_con.h

@@ -17,6 +17,7 @@ public:
 	void FilterCards();
 	void StartFilter();
 	void ClearFilter();
+	void InstantSearch();
 	void ClearSearch();
 	void SortList();
 

gframe/duelclient.cpp

@@ -283,6 +283,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->wDeckEdit->setVisible(false);
 		mainGame->wFilter->setVisible(false);
 		mainGame->wSort->setVisible(false);
+		mainGame->stTip->setVisible(false);
 		mainGame->btnSideOK->setVisible(true);
 		if(mainGame->dInfo.player_type < 7)
 			mainGame->btnLeaveGame->setVisible(false);

gframe/game.cpp

@@ -485,7 +485,7 @@ bool Game::Initialize() {
 	cbCardType2->setMaxSelectionRows(10);
 	cbCardType2->addItem(dataManager.GetSysString(1310), 0);
 	env->addStaticText(dataManager.GetSysString(1315), rect<s32>(205, 2 + 25 / 6, 280, 22 + 25 / 6), false, false, wFilter);
-	cbLimit = env->addComboBox(rect<s32>(260, 25 / 6, 390, 20 + 25 / 6), wFilter, -1);
+	cbLimit = env->addComboBox(rect<s32>(260, 25 / 6, 390, 20 + 25 / 6), wFilter, COMBOBOX_LIMIT);
 	cbLimit->setMaxSelectionRows(10);
 	cbLimit->addItem(dataManager.GetSysString(1310));
 	cbLimit->addItem(dataManager.GetSysString(1316));
@@ -496,13 +496,13 @@ bool Game::Initialize() {
 	cbLimit->addItem(dataManager.GetSysString(1242));
 	cbLimit->addItem(dataManager.GetSysString(1243));
 	env->addStaticText(dataManager.GetSysString(1319), rect<s32>(10, 22 + 50 / 6, 70, 42 + 50 / 6), false, false, wFilter);
-	cbAttribute = env->addComboBox(rect<s32>(60, 20 + 50 / 6, 190, 40 + 50 / 6), wFilter, -1);
+	cbAttribute = env->addComboBox(rect<s32>(60, 20 + 50 / 6, 190, 40 + 50 / 6), wFilter, COMBOBOX_ATTRIBUTE);
 	cbAttribute->setMaxSelectionRows(10);
 	cbAttribute->addItem(dataManager.GetSysString(1310), 0);
 	for(int filter = 0x1; filter != 0x80; filter <<= 1)
 		cbAttribute->addItem(dataManager.FormatAttribute(filter), filter);
 	env->addStaticText(dataManager.GetSysString(1321), rect<s32>(10, 42 + 75 / 6, 70, 62 + 75 / 6), false, false, wFilter);
-	cbRace = env->addComboBox(rect<s32>(60, 40 + 75 / 6, 190, 60 + 75 / 6), wFilter, -1);
+	cbRace = env->addComboBox(rect<s32>(60, 40 + 75 / 6, 190, 60 + 75 / 6), wFilter, COMBOBOX_RACE);
 	cbRace->setMaxSelectionRows(10);
 	cbRace->addItem(dataManager.GetSysString(1310), 0);
 	for(int filter = 0x1; filter != 0x2000000; filter <<= 1)

gframe/game.h

@@ -575,6 +575,8 @@ extern Game* mainGame;
 #define SCROLL_FILTER				315
 #define EDITBOX_KEYWORD				316
 #define BUTTON_CLEAR_FILTER			317
+#define COMBOBOX_ATTRIBUTE			318
+#define COMBOBOX_RACE				319
 #define BUTTON_REPLAY_START			320
 #define BUTTON_REPLAY_PAUSE			321
 #define BUTTON_REPLAY_STEP			322
@@ -592,6 +594,7 @@ extern Game* mainGame;
 #define SCROLL_VOLUME				363
 
 #define COMBOBOX_SORTTYPE			370
+#define COMBOBOX_LIMIT				371
 
 #define BUTTON_MARKS_FILTER			380
 #define BUTTON_MARKERS_OK			381

strings.conf

@@ -587,6 +587,7 @@
 !setname 0x3b 真红眼	レッドアイズ
 !setname 0x3c 爬虫妖	レプティレス
 !setname 0x3d 六武众	六武衆
+!setname 0x103d 影六武众	影六武衆
 !setname 0x3e 异虫	ワーム
 !setname 0x3f 救世	セイヴァー
 !setname 0x40 被封印	封印されし
@@ -813,8 +814,8 @@
 #!setname 0xec	魔界	魔界
 !setname 0x10ec 魔界剧团	魔界劇団
 !setname 0x20ec 魔界台本	魔界台本
-!setname 0xed 地底恐魔	Subterror
-!setname 0x10ed 地底恐魔 巨魔	Subterror Behemoth
+!setname 0xed 地中族	サブテラー
+!setname 0x10ed 地中族邪界	サブテラーマリス
 !setname 0xee 秘旋谍	SPYRAL
 !setname 0x10ee 秘旋谍装备	SPYRAL GEAR
 !setname 0x20ee 秘旋谍任务	SPYRAL MISSION
@@ -846,5 +847,7 @@
 !setname 0x103 幻变骚灵	オルターガイスト
 !setname 0x104 机怪虫	クローラー
 !setname 0x105 玄化	メタファイズ
-!setname 0x106 复仇死灵	Vendread
-!setname 0x107 F.A.
+!setname 0x106 复仇死者	ヴェンデット
+!setname 0x107 方程式运动员	F.A.
+!setname 0x108 魔弹	魔弾
+!setname 0x109 天气	天気