OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- parser for states flags.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-14 19:35:29 +01:00
commit 7bcd83f0c1
6 changed files with 87 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/scripting/decorate/thingdef_states.cpp
View file

@ -144,6 +144,22 @@ void ParseStates(FScanner &sc, PClassActor * actor, AActor * defaults, Baggage &
char lastsprite[5] = "";
FxExpression *ScriptCode;
FArgumentList *args = nullptr;
int flagdef = actor->DefaultStateUsage;
if (sc.CheckString("("))
{
flagdef = 0;
do
{
sc.MustGetString();
if (sc.Compare("Actor")) flagdef |= SUF_ACTOR;
else if (sc.Compare("Overlay")) flagdef |= SUF_OVERLAY;
else if (sc.Compare("Weapon")) flagdef |= SUF_WEAPON;
else if (sc.Compare("Item")) flagdef |= SUF_ITEM;
else sc.ScriptError("Unknown state block qualifier %s", sc.String);
} while (sc.CheckString(","));
sc.MustGetStringName(")");
}
sc.MustGetStringName ("{");
sc.SetEscape(false); // disable escape sequences in the state parser
@ -151,6 +167,7 @@ void ParseStates(FScanner &sc, PClassActor * actor, AActor * defaults, Baggage &
{
ScriptCode = nullptr;
memset(&state,0,sizeof(state));
state.UseFlags = (uint8_t)flagdef;
statestring = ParseStateString(sc);
if (!statestring.CompareNoCase("GOTO"))
{