Merge remote-tracking branch 'upstream/master' into server-develop

gframe/data_manager.cpp

@@ -217,24 +217,12 @@ bool DataManager::Error(spmemvfs_db_t* pDB, sqlite3_stmt* pStmt) {
 	return false;
 }
 #endif //YGOPRO_SERVER_MODE
-bool DataManager::GetData(unsigned int code, CardData* pData) {
-	code_pointer cdit = _datas.find(code);
+bool DataManager::GetData(unsigned int code, CardData* pData) const {
+	auto cdit = _datas.find(code);
 	if(cdit == _datas.end())
 		return false;
-	auto& data = cdit->second;
 	if (pData) {
-		pData->code = data.code;
-		pData->alias = data.alias;
-		std::memcpy(pData->setcode, data.setcode, SIZE_SETCODE);
-		pData->type = data.type;
-		pData->level = data.level;
-		pData->attribute = data.attribute;
-		pData->race = data.race;
-		pData->attack = data.attack;
-		pData->defense = data.defense;
-		pData->lscale = data.lscale;
-		pData->rscale = data.rscale;
-		pData->link_marker = data.link_marker;
+		*pData = cdit->second;
 	}
 	return true;
 }
@@ -244,7 +232,7 @@ code_pointer DataManager::GetCodePointer(unsigned int code) const {
 string_pointer DataManager::GetStringPointer(unsigned int code) const {
 	return _strings.find(code);
 }
-bool DataManager::GetString(unsigned int code, CardString* pStr) {
+bool DataManager::GetString(unsigned int code, CardString* pStr) const {
 	auto csit = _strings.find(code);
 	if(csit == _strings.end()) {
 		pStr->name = unknown_string;
@@ -254,7 +242,7 @@ bool DataManager::GetString(unsigned int code, CardString* pStr) {
 	*pStr = csit->second;
 	return true;
 }
-const wchar_t* DataManager::GetName(unsigned int code) {
+const wchar_t* DataManager::GetName(unsigned int code) const {
 	auto csit = _strings.find(code);
 	if(csit == _strings.end())
 		return unknown_string;
@@ -262,7 +250,7 @@ const wchar_t* DataManager::GetName(unsigned int code) {
 		return csit->second.name.c_str();
 	return unknown_string;
 }
-const wchar_t* DataManager::GetText(unsigned int code) {
+const wchar_t* DataManager::GetText(unsigned int code) const {
 	auto csit = _strings.find(code);
 	if(csit == _strings.end())
 		return unknown_string;
@@ -270,7 +258,7 @@ const wchar_t* DataManager::GetText(unsigned int code) {
 		return csit->second.text.c_str();
 	return unknown_string;
 }
-const wchar_t* DataManager::GetDesc(unsigned int strCode) {
+const wchar_t* DataManager::GetDesc(unsigned int strCode) const {
 	if (strCode < (MIN_CARD_ID << 4))
 		return GetSysString(strCode);
 	unsigned int code = (strCode >> 4) & 0x0fffffff;
@@ -282,7 +270,7 @@ const wchar_t* DataManager::GetDesc(unsigned int strCode) {
 		return csit->second.desc[offset].c_str();
 	return unknown_string;
 }
-const wchar_t* DataManager::GetSysString(int code) {
+const wchar_t* DataManager::GetSysString(int code) const {
 	if (code < 0 || code > MAX_STRING_ID)
 		return unknown_string;
 	auto csit = _sysStrings.find(code);
@@ -290,25 +278,25 @@ const wchar_t* DataManager::GetSysString(int code) {
 		return unknown_string;
 	return csit->second.c_str();
 }
-const wchar_t* DataManager::GetVictoryString(int code) {
+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::GetCounterName(int 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::GetSetName(int code) {
+const wchar_t* DataManager::GetSetName(int code) const {
 	auto csit = _setnameStrings.find(code);
 	if(csit == _setnameStrings.end())
-		return NULL;
+		return nullptr;
 	return csit->second.c_str();
 }
-std::vector<unsigned int> DataManager::GetSetCodes(std::wstring setname) {
+std::vector<unsigned int> DataManager::GetSetCodes(std::wstring setname) const {
 	std::vector<unsigned int> matchingCodes;
 	for(auto csit = _setnameStrings.begin(); csit != _setnameStrings.end(); ++csit) {
 		auto xpos = csit->second.find_first_of(L'|');//setname|another setname or extra info
@@ -335,8 +323,8 @@ const wchar_t* DataManager::GetNumString(int num, bool bracket) {
 	*++p = 0;
 	return numBuffer;
 }
-const wchar_t* DataManager::FormatLocation(int location, int sequence) {
-	if(location == 0x8) {
+const wchar_t* DataManager::FormatLocation(int location, int sequence) const {
+	if(location == LOCATION_SZONE) {
 		if(sequence < 5)
 			return GetSysString(1003);
 		else if(sequence == 5)
@@ -344,12 +332,16 @@ const wchar_t* DataManager::FormatLocation(int location, int sequence) {
 		else
 			return GetSysString(1009);
 	}
-	unsigned filter = 1;
 	int i = 1000;
-	for(; filter != 0x100 && filter != location; filter <<= 1)
-		++i;
-	if(filter == location)
-		return GetSysString(i);
+	int string_id = 0;
+	for (unsigned filter = LOCATION_DECK; filter <= LOCATION_PZONE; filter <<= 1, ++i) {
+		if (filter == location) {
+			string_id = i;
+			break;
+		}
+	}
+	if (string_id)
+		return GetSysString(string_id);
 	else
 		return unknown_string;
 }

gframe/data_manager.h

@@ -27,20 +27,20 @@ public:
 #else
 	bool Error(sqlite3* pDB, sqlite3_stmt* pStmt = 0);
 #endif //YGOPRO_SERVER_MODE
-	bool GetData(unsigned int code, CardData* pData);
+	bool GetData(unsigned int code, CardData* pData) const;
 	code_pointer GetCodePointer(unsigned int code) const;
 	string_pointer GetStringPointer(unsigned int code) const;
-	bool GetString(unsigned int code, CardString* pStr);
-	const wchar_t* GetName(unsigned int code);
-	const wchar_t* GetText(unsigned int code);
-	const wchar_t* GetDesc(unsigned int strCode);
-	const wchar_t* GetSysString(int code);
-	const wchar_t* GetVictoryString(int code);
-	const wchar_t* GetCounterName(int code);
-	const wchar_t* GetSetName(int code);
-	std::vector<unsigned int> GetSetCodes(std::wstring setname);
+	bool GetString(unsigned int code, CardString* pStr) const;
+	const wchar_t* GetName(unsigned int code) const;
+	const wchar_t* GetText(unsigned int code) const;
+	const wchar_t* GetDesc(unsigned int 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* GetNumString(int num, bool bracket = false);
-	const wchar_t* FormatLocation(int location, int sequence);
+	const wchar_t* FormatLocation(int location, int sequence) const;
 	const wchar_t* FormatAttribute(int attribute);
 	const wchar_t* FormatRace(int race);
 	const wchar_t* FormatType(int type);