fixconf

gframe/duelclient.cpp

@@ -1574,103 +1574,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			if (l & 0xf1)
 				panelmode = true;
 		}
-<<<<<<< HEAD
-#ifdef YGOPRO_IGNORE_SELECT_UNSELECT
-	for(int i = 0; i < 2; ++i) {
-		for(auto cit = mainGame->dField.deck[i].begin(); cit != mainGame->dField.deck[i].end(); ++cit) {
-			ClientCard* scard = (*cit);
-			if(!scard->is_selectable) {
-				seq_count++;
-				scard->select_seq = seq_count;
-				mainGame->dField.selectable_cards.push_back(scard);
-				scard->is_selectable = true;
-				scard->is_selected = false;
-			}
-		}
-		for(auto cit = mainGame->dField.hand[i].begin(); cit != mainGame->dField.hand[i].end(); ++cit) {
-			ClientCard* scard = (*cit);
-			if(!scard->is_selectable) {
-				seq_count++;
-				scard->select_seq = seq_count;
-				mainGame->dField.selectable_cards.push_back(scard);
-				scard->is_selectable = true;
-				scard->is_selected = false;
-			}
-		}
-		for(auto cit = mainGame->dField.mzone[i].begin(); cit != mainGame->dField.mzone[i].end(); ++cit) {
-			ClientCard* scard = (*cit);
-			if(!scard->is_selectable) {
-				seq_count++;
-				scard->select_seq = seq_count;
-				mainGame->dField.selectable_cards.push_back(scard);
-				scard->is_selectable = true;
-				scard->is_selected = false;
-			}
-		}
-		for(auto cit = mainGame->dField.szone[i].begin(); cit != mainGame->dField.szone[i].end(); ++cit) {
-			ClientCard* scard = (*cit);
-			if(!scard->is_selectable) {
-				seq_count++;
-				scard->select_seq = seq_count;
-				mainGame->dField.selectable_cards.push_back(scard);
-				scard->is_selectable = true;
-				scard->is_selected = false;
-			}
-		}
-		for(auto cit = mainGame->dField.grave[i].begin(); cit != mainGame->dField.grave[i].end(); ++cit) {
-			ClientCard* scard = (*cit);
-			if(!scard->is_selectable) {
-				seq_count++;
-				scard->select_seq = seq_count;
-				mainGame->dField.selectable_cards.push_back(scard);
-				scard->is_selectable = true;
-				scard->is_selected = false;
-			}
-		}
-		for(auto cit = mainGame->dField.remove[i].begin(); cit != mainGame->dField.remove[i].end(); ++cit) {
-			ClientCard* scard = (*cit);
-			if(!scard->is_selectable) {
-				seq_count++;
-				scard->select_seq = seq_count;
-				mainGame->dField.selectable_cards.push_back(scard);
-				scard->is_selectable = true;
-				scard->is_selected = false;
-			}
-		}
-		for(auto cit = mainGame->dField.extra[i].begin(); cit != mainGame->dField.extra[i].end(); ++cit) {
-			ClientCard* scard = (*cit);
-			if(!scard->is_selectable) {
-				seq_count++;
-				scard->select_seq = seq_count;
-				mainGame->dField.selectable_cards.push_back(scard);
-				scard->is_selectable = true;
-				scard->is_selected = false;
-			}
-		}
-	}
-	for(auto cit = mainGame->dField.limbo_temp.begin(); cit != mainGame->dField.limbo_temp.end(); ++cit) {
-		ClientCard* scard = (*cit);
-		if(!scard->is_selectable) {
-			seq_count++;
-			scard->select_seq = seq_count;
-			mainGame->dField.selectable_cards.push_back(scard);
-			scard->is_selectable = true;
-			scard->is_selected = false;
-		}
-	}
-	for(auto cit = mainGame->dField.overlay_cards.begin(); cit != mainGame->dField.overlay_cards.end(); ++cit) {
-		ClientCard* scard = (*cit);
-		if(!scard->is_selectable) {
-			seq_count++;
-			scard->select_seq = seq_count;
-			mainGame->dField.selectable_cards.push_back(scard);
-			scard->is_selectable = true;
-			scard->is_selected = false;
-		}
-	}
-#endif
-=======
->>>>>>> parent of abc6f61c... enable selecting all cards
 		std::sort(mainGame->dField.selectable_cards.begin(), mainGame->dField.selectable_cards.end(), ClientCard::client_card_sort);
 		if(select_hint)
 			myswprintf(textBuffer, L"%ls(%d-%d)", dataManager.GetDesc(select_hint),