ask set

gframe/client_field.h

@@ -63,7 +63,8 @@ public:
 	int announce_count;
 	int select_counter_count;
 	int select_counter_type;
-	std::vector<ClientCard*> selectable_cards;
+	int current_mset_param;
+	std::vector<ClientCard *> selectable_cards;
 	std::vector<ClientCard*> selected_cards;
 	std::set<ClientCard*> selectsum_cards;
 	std::vector<ClientCard*> selectsum_all;

gframe/event_handler.cpp

@@ -219,6 +219,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					}
 					break;
 				}
+				case MSG_SELECT_IDLECMD: {
+					mainGame->HideElement(mainGame->wQuery);
+					if(current_mset_param) {
+						DuelClient::SetResponseI(current_mset_param);
+						DuelClient::SendResponse();
+					}
+				}
 				default: {
 					mainGame->HideElement(mainGame->wQuery);
 					break;
@@ -505,8 +512,11 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					break;
 				for(size_t i = 0; i < msetable_cards.size(); ++i) {
 					if(msetable_cards[i] == clicked_card) {
-						DuelClient::SetResponseI((i << 16) + 3);
-						DuelClient::SendResponse();
+						current_mset_param = (i << 16) + 3;
+						wchar_t wbuf[256];
+						myswprintf(wbuf, dataManager.GetSysString(1355), dataManager.GetName(clicked_card->code));
+						mainGame->stQMessage->setText(wbuf);
+						mainGame->PopupElement(mainGame->wQuery);
 						break;
 					}
 				}

strings.conf

@@ -401,6 +401,7 @@
 !system 1351 投降
 !system 1352 主要信息：
 !system 1353 播放起始于回合：
+!system 1355 是否确定盖放[%ls]？
 !system 1356 是否要放弃对卡组的修改？
 !system 1357 不提示保留对卡组的修改
 !system 1358 键入关键字后自动进行搜索