OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit 'fb9231a38d' into scripting

Browse source 
Conflicts:
	src/info.cpp
	src/thingdef/thingdef_expression.cpp
	wadsrc/static/actors/constants.txt

(Scripting branch update part 2)
This commit is contained in:
Christoph Oelckers 2015-04-28 09:57:01 +02:00
commit d6e3fc0567
76 changed files with 562 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/d_dehacked.cpp
View file

@ -2244,24 +2244,25 @@ static int PatchText (int oldSize)
}
}
if (!good)
{
// Search through most other texts
const char *str;
str = EnglishStrings->MatchString (oldStr);
// Search through most other texts
const char *str;
do
{
str = EnglishStrings->MatchString(oldStr);
if (str != NULL)
{
GStrings.SetString (str, newStr);
GStrings.SetString(str, newStr);
EnglishStrings->SetString(str, "~~"); // set to something invalid so that it won't get found again by the next iteration or by another replacement later
good = true;
}
}
while (str != NULL); // repeat search until the text can no longer be found
if (!good)
{
DPrintf (" (Unmatched)\n");
}
if (!good)
{
DPrintf (" (Unmatched)\n");
}
donewithtext:
if (newStr)
delete[] newStr;