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

gframe/duelclient.cpp

@@ -1643,7 +1643,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		int c, l, s, ss;
 		unsigned int code;
 		bool panelmode = false;
-		int handcount = 0;
+		int hand_count[2] = { mainGame->dField.hand[0].size(), mainGame->dField.hand[1].size() };
+		int select_count_in_hand[2] = { 0, 0 };
 		bool select_ready = mainGame->dField.select_min == 0;
 		mainGame->dField.select_ready = select_ready;
 		ClientCard* pcard;
@@ -1669,9 +1670,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			pcard->is_selected = false;
 			if (l & 0xf1)
 				panelmode = true;
-			if(l & LOCATION_HAND) {
-				handcount++;
-				if(handcount >= 10)
+			if((l & LOCATION_HAND) && hand_count[c] >= 10) {
+				if(++select_count_in_hand[c] > 1)
 					panelmode = true;
 			}
 		}
@@ -1712,6 +1712,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		int c, l, s, ss;
 		unsigned int code;
 		bool panelmode = false;
+		int hand_count[2] = { mainGame->dField.hand[0].size(), mainGame->dField.hand[1].size() };
+		int select_count_in_hand[2] = { 0, 0 };
 		mainGame->dField.select_ready = false;
 		ClientCard* pcard;
 		for (int i = 0; i < count1; ++i) {
@@ -1736,6 +1738,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			pcard->is_selected = false;
 			if (l & 0xf1)
 				panelmode = true;
+			if((l & LOCATION_HAND) && hand_count[c] >= 10) {
+				if(++select_count_in_hand[c] > 1)
+					panelmode = true;
+			}
 		}
 		int count2 = BufferIO::ReadInt8(pbuf);
 		for (int i = count1; i < count1 + count2; ++i) {
@@ -1760,6 +1766,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			pcard->is_selected = true;
 			if (l & 0xf1)
 				panelmode = true;
+			if((l & LOCATION_HAND) && hand_count[c] >= 10) {
+				if(++select_count_in_hand[c] > 1)
+					panelmode = true;
+			}
 		}
 		std::sort(mainGame->dField.selectable_cards.begin(), mainGame->dField.selectable_cards.end(), ClientCard::client_card_sort);
 		if(select_hint)

gframe/gframe.cpp

@@ -112,8 +112,11 @@ int main(int argc, char* argv[]) {
 		} else if(!wcscmp(wargv[i], L"-k")) { // Keep on return
 			exit_on_return = false;
 			keep_on_return = true;
+<<<<<<< HEAD
 		} else if(!wcscmp(wargv[i], L"--auto-watch")) { // Auto watch mode
 			auto_watch_mode = true;
+=======
+>>>>>>> 296ee7aeae5f923b59c29c3460794e85e825e95c
 		} else if(!wcscmp(wargv[i], L"--deck-category")) {
 			++i;
 			if(i < wargc) {
@@ -132,7 +135,7 @@ int main(int argc, char* argv[]) {
 				if(i < wargc) {
 					open_file = true;
 					wcscpy(open_file_name, wargv[i]);
-					if(deckCategorySpecified) {
+					if(deckCategorySpecified && wcslen(ygo::mainGame->gameConf.lastcategory)) {
 						swprintf(open_file_name_with_category, 256, L"%ls/%ls", ygo::mainGame->gameConf.lastcategory, open_file_name);
 					} else {
 						wcscpy(open_file_name_with_category, open_file_name);