From 525b0214a7e5024e8033f36d8550c6080005a33e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 4 Mar 2019 17:31:11 +0100 Subject: [PATCH] - fixed macro substitution. It was retrieving the macro from the wrong string. --- src/gamedata/stringtable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gamedata/stringtable.cpp b/src/gamedata/stringtable.cpp index a892992e1..8d3344a0e 100644 --- a/src/gamedata/stringtable.cpp +++ b/src/gamedata/stringtable.cpp @@ -354,7 +354,7 @@ void FStringTable::InsertString(int langid, FName label, const FString &string) Printf("Bad macro in %s : %s\n", strlangid, label.GetChars()); break; } - FString macroname(string.GetChars() + index + 2, endindex - index - 2); + FString macroname(te.strings[0].GetChars() + index + 2, endindex - index - 2); FStringf lookupstr("%s/%s", strlangid, macroname.GetChars()); FStringf replacee("@[%s]", macroname.GetChars()); FName lookupname(lookupstr, true);