Merge remote-tracking branch 'salix/patch-map' into develop

gframe/data_manager.cpp

@@ -221,32 +221,26 @@ const wchar_t* DataManager::GetDesc(uint32_t strCode) const {
 		return csit->second.desc[offset].c_str();
 	return unknown_string;
 }
-const wchar_t* DataManager::GetSysString(int code) const {
-	auto csit = _sysStrings.find(code);
-	if(csit == _sysStrings.end())
+const wchar_t* DataManager::GetMapString(const wstring_map& table, uint32_t code) const {
+	auto csit = table.find(code);
+	if (csit == table.end())
 		return unknown_string;
 	return csit->second.c_str();
 }
-const wchar_t* DataManager::GetVictoryString(int code) const {
-	auto csit = _victoryStrings.find(code);
-	if(csit == _victoryStrings.end())
-		return unknown_string;
-	return csit->second.c_str();
+const wchar_t* DataManager::GetSysString(uint32_t code) const {
+	return GetMapString(_sysStrings, code);
 }
-const wchar_t* DataManager::GetCounterName(int code) const {
-	auto csit = _counterStrings.find(code);
-	if(csit == _counterStrings.end())
-		return unknown_string;
-	return csit->second.c_str();
+const wchar_t* DataManager::GetVictoryString(uint32_t code) const {
+	return GetMapString(_victoryStrings, code);
 }
-const wchar_t* DataManager::GetSetName(int code) const {
-	auto csit = _setnameStrings.find(code);
-	if(csit == _setnameStrings.end())
-		return unknown_string;
-	return csit->second.c_str();
+const wchar_t* DataManager::GetCounterName(uint32_t code) const {
+	return GetMapString(_counterStrings, code);
+}
+const wchar_t* DataManager::GetSetName(uint32_t code) const {
+	return GetMapString(_setnameStrings, code);
 }
-std::vector<unsigned int> DataManager::GetSetCodes(std::wstring setname) const {
-	std::vector<unsigned int> matchingCodes;
+std::vector<uint32_t> DataManager::GetSetCodes(std::wstring setname) const {
+	std::vector<uint32_t> matchingCodes;
 	for(auto csit = _setnameStrings.begin(); csit != _setnameStrings.end(); ++csit) {
 		auto xpos = csit->second.find_first_of(L'|');//setname|another setname or extra info
 		if(setname.size() < 2) {

gframe/data_manager.h

@@ -57,6 +57,7 @@ struct CardString {
 };
 using code_pointer = std::unordered_map<uint32_t, CardDataC>::const_iterator;
 using string_pointer = std::unordered_map<uint32_t, CardString>::const_iterator;
+using wstring_map = std::unordered_map<uint32_t, std::wstring>;
 
 class ClientCard;
 
@@ -83,11 +84,11 @@ public:
 	const wchar_t* GetName(uint32_t code) const;
 	const wchar_t* GetText(uint32_t code) const;
 	const wchar_t* GetDesc(uint32_t strCode) const;
-	const wchar_t* GetSysString(int code) const;
-	const wchar_t* GetVictoryString(int code) const;
-	const wchar_t* GetCounterName(int code) const;
-	const wchar_t* GetSetName(int code) const;
-	std::vector<unsigned int> GetSetCodes(std::wstring setname) const;
+	const wchar_t* GetSysString(uint32_t code) const;
+	const wchar_t* GetVictoryString(uint32_t code) const;
+	const wchar_t* GetCounterName(uint32_t code) const;
+	const wchar_t* GetSetName(uint32_t code) const;
+	std::vector<uint32_t> GetSetCodes(std::wstring setname) const;
 	std::wstring GetNumString(int num, bool bracket = false) const;
 	const wchar_t* FormatLocation(int location, int sequence) const;
 	const wchar_t* FormatLocation(ClientCard* card) const;
@@ -97,18 +98,18 @@ public:
 	std::wstring FormatSetName(const uint16_t setcode[]) const;
 	std::wstring FormatLinkMarker(unsigned int link_marker) const;
 
-	std::unordered_map<unsigned int, std::wstring> _counterStrings;
-	std::unordered_map<unsigned int, std::wstring> _victoryStrings;
-	std::unordered_map<unsigned int, std::wstring> _setnameStrings;
-	std::unordered_map<unsigned int, std::wstring> _sysStrings;
+	wstring_map _counterStrings;
+	wstring_map _victoryStrings;
+	wstring_map _setnameStrings;
+	wstring_map _sysStrings;
 	char errmsg[512]{};
 	const wchar_t* unknown_string{ L"???" };
 	irr::io::IFileSystem* FileSystem{};
 
-	static constexpr int STRING_ID_LOCATION = 1000;
-	static constexpr int STRING_ID_ATTRIBUTE = 1010;
-	static constexpr int STRING_ID_RACE = 1020;
-	static constexpr int STRING_ID_TYPE = 1050;
+	static constexpr uint32_t STRING_ID_LOCATION = 1000;
+	static constexpr uint32_t STRING_ID_ATTRIBUTE = 1010;
+	static constexpr uint32_t STRING_ID_RACE = 1020;
+	static constexpr uint32_t STRING_ID_TYPE = 1050;
 	static constexpr int TYPES_COUNT = 27;
 
 	static unsigned char scriptBuffer[0x100000];
@@ -126,6 +127,7 @@ public:
 	static bool deck_sort_name(code_pointer l1, code_pointer l2);
 
 private:
+	const wchar_t* GetMapString(const wstring_map& table, uint32_t code) const;
 	std::unordered_map<uint32_t, CardDataC> _datas;
 	std::unordered_map<uint32_t, CardString> _strings;
 	std::unordered_map<uint32_t, std::vector<uint16_t>> extra_setcode;

gframe/deck_con.cpp

@@ -1396,7 +1396,7 @@ void DeckBuilder::FilterCards() {
 	results.clear();
 	struct element_t {
 		std::wstring keyword;
-		std::vector<unsigned int> setcodes;
+		std::vector<uint32_t> setcodes;
 		enum class type_t {
 			all,
 			name,