DataManager: fix FormatSetName

gframe/data_manager.cpp

@@ -344,23 +344,21 @@ std::wstring DataManager::FormatType(unsigned int type) const {
 	buffer.pop_back();
 	return buffer;
 }
-const wchar_t* DataManager::FormatSetName(const uint16_t setcode[]) {
-	wchar_t* p = scBuffer;
+std::wstring DataManager::FormatSetName(const uint16_t setcode[]) const {
+	std::wstring buffer;
 	for(int i = 0; i < 10; ++i) {
 		if (!setcode[i])
 			break;
 		const wchar_t* setname = GetSetName(setcode[i]);
 		if(setname) {
-			BufferIO::CopyWStrRef(setname, p, 32);
-			*p = L'|';
-			*++p = 0;
+			buffer.append(setname);
+			buffer.push_back(L'|');
 		}
 	}
-	if(p != scBuffer)
-		*(p - 1) = 0;
-	else
-		return unknown_string;
-	return scBuffer;
+	if (buffer.empty())
+		return std::wstring(unknown_string);
+	buffer.pop_back();
+	return buffer;
 }
 const wchar_t* DataManager::FormatLinkMarker(int link_marker) {
 	wchar_t* p = lmBuffer;

gframe/data_manager.h

@@ -36,7 +36,7 @@ public:
 	std::wstring FormatAttribute(unsigned int attribute) const;
 	std::wstring FormatRace(unsigned int race) const;
 	std::wstring FormatType(unsigned int type) const;
-	const wchar_t* FormatSetName(const uint16_t setcode[]);
+	std::wstring FormatSetName(const uint16_t setcode[]) const;
 	const wchar_t* FormatLinkMarker(int link_marker);
 
 	std::unordered_map<unsigned int, std::wstring> _counterStrings;
@@ -50,7 +50,6 @@ public:
 
 	wchar_t numStrings[301][4]{};
 	wchar_t numBuffer[6]{};
-	wchar_t scBuffer[128]{};
 	wchar_t lmBuffer[32]{};
 
 	static byte scriptBuffer[0x20000];

gframe/game.cpp

@@ -1563,7 +1563,7 @@ void Game::ShowCardInfo(int code, bool resize) {
 		}
 		if (target->second.setcode[0]) {
 			offset = 23;// *yScale;
-			myswprintf(formatBuffer, L"%ls%ls", dataManager.GetSysString(1329), dataManager.FormatSetName(target->second.setcode));
+			myswprintf(formatBuffer, L"%ls%ls", dataManager.GetSysString(1329), dataManager.FormatSetName(target->second.setcode).c_str());
 			stSetName->setText(formatBuffer);
 		}
 		else