zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 22:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- merge whitespaces before comparing Dehacked texts

Browse source 
With introduction of localization support, several strings are no longer identical to the original messages
Double spaces were removed, and letter case was changed
The latter is already handled, extra whitespaces are now deleted to deal with the former

https://forum.zdoom.org/viewtopic.php?t=69236
This commit is contained in:
alexey.lysiuk 2020-07-12 11:07:49 +03:00
parent 6e79209931
commit fcb6e1b18c
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/gamedata/d_dehacked.cpp
View file

@ -2191,22 +2191,18 @@ static int PatchText (int oldSize)
}
newSize = atoi (temp);
oldStr = new char[oldSize + 1];
newStr = new char[newSize + 1];
if (!oldStr || !newStr)
{
Printf ("Out of memory.\n");
goto donewithtext;
}
FString oldStrData, newStrData;
oldStr = oldStrData.LockNewBuffer(oldSize + 1);
newStr = newStrData.LockNewBuffer(newSize + 1);
good = ReadChars (&oldStr, oldSize);
good += ReadChars (&newStr, newSize);
oldStrData.UnlockBuffer();
newStrData.UnlockBuffer();
if (!good)
{
delete[] newStr;
delete[] oldStr;
Printf ("Unexpected end-of-file.\n");
return 0;
}
@ -2271,11 +2267,11 @@ static int PatchText (int oldSize)
const char *str;
do
{
oldStrData.MergeChars(' ');
str = EnglishStrings.MatchString(oldStr);
if (str != NULL)
{
FString newname = newStr;
TableElement te = { LumpFileNum, { newname, newname, newname, newname } };
TableElement te = { LumpFileNum, { newStrData, newStrData, newStrData, newStrData } };
DehStrings.Insert(str, te);
EnglishStrings.Remove(str); // remove entry so that it won't get found again by the next iteration or by another replacement later
good = true;
@ -2289,11 +2285,6 @@ static int PatchText (int oldSize)
}
donewithtext:
if (newStr)
delete[] newStr;
if (oldStr)
delete[] oldStr;
// Fetch next identifier for main loop
while ((result = GetLine ()) == 1)
;