更改为打开准备房间时刷新卡组管理按钮内容

添加卡组错误时点确定恢复卡组管理按钮可用

Classes/gframe/duelclient.cpp

@@ -319,6 +319,7 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, unsigned int len) {
 			mainGame->addMessageBox(L"", msgbuf);
 			mainGame->cbCategorySelect->setEnabled(true);
 			mainGame->cbDeckSelect->setEnabled(true);
+			mainGame->btnHostPrepStart->setEnabled(true);
 			mainGame->gMutex.unlock();
 			break;
 		}
@@ -494,6 +495,11 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, unsigned int len) {
 		mainGame->HideElement(mainGame->wLanWindow);
 		mainGame->HideElement(mainGame->wSinglePlay);
 		mainGame->ShowElement(mainGame->wHostPrepare);
+        wchar_t cate[256];
+        wchar_t cate_deck[256];
+        myswprintf(cate, L"%ls%ls", (mainGame->cbCategorySelect->getSelected())==2 ? L"" : mainGame->cbCategorySelect->getItem(mainGame->cbCategorySelect->getSelected()), (mainGame->cbCategorySelect->getSelected())==2 ? L"" : L"-");
+        myswprintf(cate_deck, L"%ls%ls", cate, mainGame->cbDeckSelect->getItem(mainGame->cbDeckSelect->getSelected()));
+        mainGame->btnHostDeckSelect->setText(cate_deck);
 		if(!mainGame->chkIgnore1->isChecked())
 			mainGame->wChat->setVisible(true);
 		mainGame->gMutex.unlock();

Classes/gframe/game.cpp

@@ -474,12 +474,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
 		ChangeToIGUIImageButton(btnHostPrepStart, imageManager.tButton_S, imageManager.tButton_S_pressed);
 	btnHostPrepCancel = env->addButton(rect<s32>(440 * xScale, 350 * yScale, 550 * xScale, 390 * yScale), wHostPrepare, BUTTON_HP_CANCEL, dataManager.GetSysString(1210));
 		ChangeToIGUIImageButton(btnHostPrepCancel, imageManager.tButton_S, imageManager.tButton_S_pressed);
-
-    wchar_t cate[256];
-    wchar_t cate_deck[256];
-    myswprintf(cate, L"%ls%ls", gameConf.lastcategory == dataManager.GetSysString(1452)? L"" : gameConf.lastcategory, gameConf.lastcategory == dataManager.GetSysString(1452)? L"" : L"-");
-    myswprintf(cate_deck, L"%ls%ls", cate, gameConf.lastdeck);
-    btnHostDeckSelect = env->addButton(rect<s32>(320 * xScale, 300 * yScale, 550 * xScale, 340 * yScale), wHostPrepare, BUTTON_HP_DECK_SELECT, cate_deck);
+    btnHostDeckSelect = env->addButton(rect<s32>(320 * xScale, 300 * yScale, 550 * xScale, 340 * yScale), wHostPrepare, BUTTON_HP_DECK_SELECT, L"");
 
 	//img always use *yScale to keep proportion
 	wCardImg = env->addStaticText(L"",rect<s32>(1 * yScale, 1 * yScale, ( 2 + CARD_IMG_WIDTH) * yScale, (2 + CARD_IMG_HEIGHT) * yScale), true, false, 0, -1, true);

Classes/gframe/menu_handler.cpp

@@ -210,6 +210,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 			case BUTTON_HP_DUELIST: {
 				mainGame->cbCategorySelect->setEnabled(true);
 				mainGame->cbDeckSelect->setEnabled(true);
+				mainGame->btnHostDeckSelect->setEnabled(true);
 				DuelClient::SendPacketToServer(CTOS_HS_TODUELIST);
 				break;
 			}