OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Stop aliasing strings onto names for function parameters.

Browse source 
SVN r1923 (scripting)
This commit is contained in:
Randy Heit 2009-10-17 01:38:54 +00:00
commit e209a2f208
6 changed files with 90 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/thingdef/thingdef_parse.cpp
View file

@ -85,12 +85,21 @@ FxExpression *ParseParameter(FScanner &sc, PClass *cls, char type, bool constant
x = new FxClassTypeCast(RUNTIME_CLASS(AActor), new FxConstant(FName(sc.String), sc));
break;
case 'N':
case 'n': // name
case 'T':
case 't': // String
sc.SetEscape(true);
sc.MustGetString();
sc.SetEscape(false);
x = new FxConstant(sc.String[0]? FName(sc.String) : NAME_None, sc);
if (type == 'n' || type == 'N')
{
x = new FxConstant(sc.String[0] ? FName(sc.String) : NAME_None, sc);
}
else
{
x = new FxConstant(strbin1(sc.String), sc);
}
break;
case 'C':
@ -855,7 +864,7 @@ static void ParseActionDef (FScanner &sc, PClass *cls)
case TK_Sound: type = 's'; break;
case TK_String: type = 't'; break;
case TK_Name: type = 't'; break;
case TK_Name: type = 'n'; break;
case TK_State: type = 'l'; break;
case TK_Color: type = 'c'; break;
case TK_Class: