zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-04 03:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use FString for returning strings from the script parser.

Browse source 
This is mainly a preparation for merging the parser into sc_man, because sc_man does not keep token texts in a static variable.
This commit also fixes a handful of places that were flagged by the stricter conversion rules of FString.
This commit is contained in:
Christoph Oelckers 2020-09-13 10:29:57 +02:00
parent aac87fc2cf
commit 57a9419f8e
6 changed files with 86 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/common/engine/stringtable.cpp
View file

@ -450,7 +450,7 @@ void FStringTable::InsertString(int lumpnum, int langid, FName label, const FStr
auto replace = allMacros.CheckKey(lookupname);
for (int i = 0; i < 4; i++)
{
const char *replacement = replace && replace->Replacements[i] ? replace->Replacements[i].GetChars() : "";
const char *replacement = replace ? replace->Replacements[i].GetChars() : "";
te.strings[i].Substitute(replacee, replacement);
}
}