Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server

gframe/client_field.cpp

@@ -1148,7 +1148,12 @@ bool ClientField::ShowSelectSum(bool panelmode) {
 			} else {
 				select_ready = true;
 				mainGame->wCardSelect->setVisible(false);
-				mainGame->dField.ShowSelectCard(true);
+				wchar_t wbuf[256], *pwbuf = wbuf;
+				BufferIO::CopyWStrRef(dataManager.GetSysString(209), pwbuf, 256);
+				*pwbuf++ = L'\n';
+				BufferIO::CopyWStrRef(dataManager.GetSysString(210), pwbuf, 256);
+				mainGame->stQMessage->setText(wbuf);
+				mainGame->PopupElement(mainGame->wQuery);
 			}
 		} else {
 			select_ready = false;
@@ -1500,8 +1505,13 @@ void ClientField::UpdateDeclarableCodeType(bool enter) {
 			auto cp = dataManager.GetCodePointer(cit->first);	//verified by _strings
 			//datas.alias can be double card names or alias
 			if(is_declarable(cp->second, declarable_type)) {
-				mainGame->lstANCard->addItem(cit->second.name);
-				ancard.push_back(cit->first);
+				if(wcscmp(pname, cit->second.name) == 0) { //exact match
+					mainGame->lstANCard->insertItem(0, cit->second.name, -1);
+					ancard.insert(ancard.begin(), cit->first);
+				} else {
+					mainGame->lstANCard->addItem(cit->second.name);
+					ancard.push_back(cit->first);
+				}
 			}
 		}
 	}
@@ -1527,8 +1537,13 @@ void ClientField::UpdateDeclarableCodeOpcode(bool enter) {
 			auto cp = dataManager.GetCodePointer(cit->first);	//verified by _strings
 			//datas.alias can be double card names or alias
 			if(is_declarable(cp->second, opcode)) {
-				mainGame->lstANCard->addItem(cit->second.name);
-				ancard.push_back(cit->first);
+				if(wcscmp(pname, cit->second.name) == 0) { //exact match
+					mainGame->lstANCard->insertItem(0, cit->second.name, -1);
+					ancard.insert(ancard.begin(), cit->first);
+				} else {
+					mainGame->lstANCard->addItem(cit->second.name);
+					ancard.push_back(cit->first);
+				}
 			}
 		}
 	}

gframe/client_field.h

@@ -55,6 +55,7 @@ public:
 	int select_sumval;
 	int select_cancelable;
 	int select_mode;
+	bool select_panalmode;
 	bool select_ready;
 	int announce_count;
 	int declarable_type;

gframe/deck_con.cpp

@@ -205,6 +205,11 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				DuelClient::SendBufferToServer(CTOS_UPDATE_DECK, deckbuf, pdeck - deckbuf);
 				break;
 			}
+			case BUTTON_MSG_OK: {
+				mainGame->HideElement(mainGame->wMessage);
+				mainGame->actionSignal.Set();
+				break;
+			}
 			case BUTTON_YES: {
 				mainGame->HideElement(mainGame->wQuery);
 				if(!mainGame->is_building || mainGame->is_siding)

gframe/duelclient.cpp

@@ -522,6 +522,8 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->closeDoneSignal.Wait();
 		mainGame->gMutex.Lock();
 		mainGame->dInfo.isStarted = false;
+		mainGame->is_building = false;
+		mainGame->wDeckEdit->setVisible(false);
 		mainGame->btnCreateHost->setEnabled(true);
 		mainGame->btnJoinHost->setEnabled(true);
 		mainGame->btnJoinCancel->setEnabled(true);
@@ -1458,7 +1460,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		mainGame->dField.selectsum_all.clear();
 		mainGame->dField.selected_cards.clear();
 		mainGame->dField.selectsum_cards.clear();
-		bool panelmode = false;
+		mainGame->dField.select_panalmode = false;
 		for (int i = 0; i < mainGame->dField.must_select_count; ++i) {
 			unsigned int code = (unsigned int)BufferIO::ReadInt32(pbuf);
 			int c = mainGame->LocalPlayer(BufferIO::ReadInt8(pbuf));
@@ -1484,20 +1486,20 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			pcard->select_seq = i;
 			mainGame->dField.selectsum_all.push_back(pcard);
 			if ((l & 0xe) == 0)
-				panelmode = true;
+				mainGame->dField.select_panalmode = true;
 		}
 		std::sort(mainGame->dField.selectsum_all.begin(), mainGame->dField.selectsum_all.end(), ClientCard::client_card_sort);
 		if(select_hint)
 			myswprintf(textBuffer, L"%ls(%d)", dataManager.GetDesc(select_hint), mainGame->dField.select_sumval);
 		else myswprintf(textBuffer, L"%ls(%d)", dataManager.GetSysString(560), mainGame->dField.select_sumval);
 		select_hint = 0;
-		if (panelmode) {
+		if(mainGame->dField.select_panalmode) {
 			mainGame->wCardSelect->setText(textBuffer);
 		} else {
 			mainGame->stHintMsg->setText(textBuffer);
 			mainGame->stHintMsg->setVisible(true);
 		}
-		return mainGame->dField.ShowSelectSum(panelmode);
+		return mainGame->dField.ShowSelectSum(mainGame->dField.select_panalmode);
 	}
 	case MSG_SORT_CARD:
 	case MSG_SORT_CHAIN: {

gframe/event_handler.cpp

@@ -299,6 +299,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				case MSG_SELECT_TRIBUTE:
 				case MSG_SELECT_SUM: {
 					mainGame->HideElement(mainGame->wQuery);
+					if(select_panalmode)
+						mainGame->dField.ShowSelectCard(true);
 					break;
 				}
 				case MSG_SELECT_CHAIN: {
@@ -891,6 +893,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				}
 				break;
 			}
+			case LISTBOX_ANCARD: {
+				int sel = mainGame->lstANCard->getSelected();
+				if(sel != -1) {
+					mainGame->ShowCardInfo(ancard[sel]);
+				}
+				break;
+			}
 			}
 			break;
 		}

gframe/gframe.cpp

@@ -6,6 +6,7 @@
 int enable_log = 1;
 bool exit_on_return = false;
 bool runasserver = true;
+bool keep_on_return = false;
 bool open_file = false;
 wchar_t open_file_name[256] = L"";
 
@@ -121,11 +122,16 @@ int main(int argc, char* argv[]) {
 			continue;
 		} else if(!strcmp(argv[i], "-x")) { // eXit on return
 			exit_on_return = true;
+		} else if(!strcmp(argv[i], "-k")) { // Keep on return
+			exit_on_return = false;
+			keep_on_return = true;
 		} else if(!strcmp(argv[i], "-j")) { // Join host
+			exit_on_return = !keep_on_return;
 			ClickButton(ygo::mainGame->btnLanMode);
 			ClickButton(ygo::mainGame->btnJoinHost);
 			break;
 		} else if(!strcmp(argv[i], "-d")) { // Deck
+			exit_on_return = !keep_on_return;
 			if(i < argc) {
 				open_file = true;
 				GetParameterW(open_file_name, &argv[i + 1][0]);
@@ -133,6 +139,7 @@ int main(int argc, char* argv[]) {
 			ClickButton(ygo::mainGame->btnDeckEdit);
 			break;
 		} else if(!strcmp(argv[i], "-r")) { // Replay
+			exit_on_return = !keep_on_return;
 			if(i < argc) {
 				open_file = true;
 				GetParameterW(open_file_name, &argv[i + 1][0]);
@@ -142,6 +149,7 @@ int main(int argc, char* argv[]) {
 				ClickButton(ygo::mainGame->btnLoadReplay);
 			break;
 		} else if(!strcmp(argv[i], "-s")) { // Single
+			exit_on_return = !keep_on_return;
 			if(i < argc) {
 				open_file = true;
 				GetParameterW(open_file_name, &argv[i + 1][0]);