OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Enable arg0str for UDMF things and named scripts.

Browse source 
SVN r3390 (trunk)
This commit is contained in:
Randy Heit 2012-02-26 02:32:45 +00:00
commit 3fae0e3906
2 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/p_udmf.cpp
View file

@ -466,6 +466,8 @@ public:
void ParseThing(FMapThing *th)
{
FString arg0str;
memset(th, 0, sizeof(*th));
sc.MustGetToken('{');
while (!sc.CheckToken('}'))
@ -516,6 +518,11 @@ public:
th->args[int(key)-int(NAME_Arg0)] = CheckInt(key);
break;
case NAME_Arg0Str:
CHECK_N(Zd);
arg0str = CheckString(key);
break;
case NAME_Skill1:
case NAME_Skill2:
case NAME_Skill3:
@ -616,6 +623,10 @@ public:
break;
}
}
if (arg0str.IsNotEmpty() && P_IsACSSpecial(th->special))
{
th->args[0] = -FName(arg0str);
}
// Thing specials are only valid in namespaces with Hexen-type specials
// and in ZDoomTranslated - which will use the translator on them.
if (namespc == NAME_ZDoomTranslated)