- clear the Dehacked string table after passing it to GStrings.

For some reason std::move does not work here so make sure it won't stick around.
RicardoLuis0 · Sep 15, 2023 · 7f7edc4 · 7f7edc4
1 parent d001c34
commit 7f7edc4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/common/engine/stringtable.cpp b/src/common/engine/stringtable.cpp
@@ -51,6 +51,7 @@ void FStringTable::LoadStrings (const char *language)
 {
 	int lastlump, lump;
 
+	allStrings.Clear();
 	lastlump = 0;
 	while ((lump = fileSystem.FindLump("LMACROS", &lastlump)) != -1)
 	{

diff --git a/src/common/engine/stringtable.h b/src/common/engine/stringtable.h
@@ -87,7 +87,7 @@ class FStringTable
 	void LoadStrings(const char *language);
 	void UpdateLanguage(const char* language);
 	StringMap GetDefaultStrings() { return allStrings[default_table]; }	// Dehacked needs these for comparison
-	void SetOverrideStrings(StringMap && map)
+	void SetOverrideStrings(StringMap & map)
 	{
 		allStrings.Insert(override_table, map);
 		UpdateLanguage(nullptr);

diff --git a/src/gamedata/d_dehacked.cpp b/src/gamedata/d_dehacked.cpp
@@ -3734,7 +3734,8 @@ void FinishDehPatch ()
 	OrgSprNames.Reset();
 	TouchedActors.Reset();
 	EnglishStrings.Clear();
-	GStrings.SetOverrideStrings(std::move(DehStrings));
+	GStrings.SetOverrideStrings(DehStrings);
+	DehStrings.Clear();
 
 	// Now it gets nasty: We have to fiddle around with the weapons' ammo use info to make Doom's original
 	// ammo consumption work as intended.