Make sure that cards that exactly match a name are always sorted properly

Author: edo9300

gframe/deck_con.cpp

@@ -1310,27 +1310,29 @@ void DeckBuilder::ClearFilter() {
 		mainGame->btnMark[i]->setPressed(false);
 }
 void DeckBuilder::SortList() {
-	auto left = results.begin();
-	for(auto it = results.begin(); it != results.end(); ++it) {
-		if(searched_terms.find(std::wstring{ gDataManager->GetUppercaseName((*it)->code) }) != searched_terms.end()) {
-			std::iter_swap(left, it);
-			++left;
-		}
-	}
+	auto sort = [&](auto& comparator) {
+		std::sort(results.begin(), results.end(), comparator);
+	};
 	switch(mainGame->cbSortType->getSelected()) {
 	case 0:
-		std::sort(left, results.end(), DataManager::deck_sort_lv);
+		sort(DataManager::deck_sort_lv);
 		break;
 	case 1:
-		std::sort(left, results.end(), DataManager::deck_sort_atk);
+		sort( DataManager::deck_sort_atk);
 		break;
 	case 2:
-		std::sort(left, results.end(), DataManager::deck_sort_def);
+		sort(DataManager::deck_sort_def);
 		break;
 	case 3:
-		std::sort(left, results.end(), DataManager::deck_sort_name);
+		sort(DataManager::deck_sort_name);
 		break;
 	}
+	for(auto it = results.begin(), left = it; it != results.end(); ++it) {
+		if(searched_terms.find(gDataManager->GetUppercaseName((*it)->code)) != searched_terms.end()) {
+			std::iter_swap(left, it);
+			++left;
+		}
+	}
 }
 void DeckBuilder::ClearDeck() {
 	current_deck.main.clear();

gframe/deck_con.h

@@ -136,7 +136,7 @@ class DeckBuilder: public irr::IEventReceiver {
 	uint16_t side_spell_count;
 	uint16_t side_trap_count;
 	LFList* filterList;
-	std::map<std::wstring, std::vector<const CardDataC*>> searched_terms;
+	std::map<std::wstring, std::vector<const CardDataC*>, std::less<>> searched_terms;
 	std::vector<const CardDataC*> results;
 	std::wstring result_string;
 };