Fixes for sound replacement strings

Author: FreeSlave

dlls/soundreplacement.cpp

@@ -20,9 +20,11 @@ const std::string& SoundReplacementList::ReplacementFor(const std::string &sound
 	if (it != _replacementMap.end()) {
 		return it->second;
 	}
-	return std::string();
+	return SoundReplacementSystem::emptyString;
 }
 
+const std::string SoundReplacementSystem::emptyString;
+
 static void LogExpectedQuoteError(const char* fileName, int line, int pos)
 {
 	ALERT(at_console, "Parsing %s. Expected \" at line %d, position %d\n", fileName, line, pos);
@@ -90,7 +92,7 @@ bool SoundReplacementSystem::EnsureReplacementFile(const char *fileName)
 					const std::string originalName(buffer + origNameStart, buffer + origNameEnd);
 					const std::string replacementName(buffer + replNameStart, buffer + replNameEnd);
 					replacementMap[originalName] = replacementName;
-					ALERT(at_console, "File '%s' is replaced with '%s'\n", originalName.c_str(), replacementName.c_str());
+					ALERT(at_console, "Sound replacement '%s': '%s' is replaced with '%s'\n", fileName, originalName.c_str(), replacementName.c_str());
 				}
 				else
 				{
@@ -138,5 +140,5 @@ const std::string& SoundReplacementSystem::FindReplacement(const char *fileName,
 			return soundReplacementFile.ReplacementFor(originalSoundName);
 		}
 	}
-	return std::string();
+	return SoundReplacementSystem::emptyString;
 }

dlls/soundreplacement.h

@@ -8,7 +8,7 @@
 class SoundReplacementList
 {
 public:
-	typedef std::map<const std::string, const std::string> ReplacementMap;
+	typedef std::map<std::string, std::string> ReplacementMap;
 	SoundReplacementList();
 	SoundReplacementList(ReplacementMap&& replacementMap);
 	bool IsValid() const;
@@ -23,6 +23,8 @@ class SoundReplacementSystem
 public:
 	bool EnsureReplacementFile(const char* fileName);
 	const std::string& FindReplacement(const char* fileName, const char* originalSoundName);
+
+	static const std::string emptyString;
 private:
 	std::map<std::string, SoundReplacementList> _fileMap;
 };