From c797319314ec1f3e28de335e4b6a07e9229df37c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 14 Nov 2016 20:00:01 +0100 Subject: [PATCH] - fixed parser for state block options. - fixed incorrect flags for weapons. --- src/scripting/zscript/zcc-parse.lemon | 1 - wadsrc/static/zscript/shared/inventory.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/scripting/zscript/zcc-parse.lemon b/src/scripting/zscript/zcc-parse.lemon index 1882aa41c..a29d3d943 100644 --- a/src/scripting/zscript/zcc-parse.lemon +++ b/src/scripting/zscript/zcc-parse.lemon @@ -421,7 +421,6 @@ enumerator(X) ::= IDENTIFIER(A) EQ expr(B). /* Expression must be constant. */ %type states_opts { ZCC_Identifier *} %type states_opt { ZCC_Identifier *} -states_def(X) ::= STATES(T) scanner_mode LBRACE states_body(A) RBRACE. states_def(X) ::= STATES(T) states_opts(B) scanner_mode LBRACE states_body(A) RBRACE. { NEW_AST_NODE(States,def,T); diff --git a/wadsrc/static/zscript/shared/inventory.txt b/wadsrc/static/zscript/shared/inventory.txt index 9bc99cefb..c6fb203a8 100644 --- a/wadsrc/static/zscript/shared/inventory.txt +++ b/wadsrc/static/zscript/shared/inventory.txt @@ -469,7 +469,7 @@ class Weapon : StateProvider native Weapon.BobRangeX 1.0; Weapon.BobRangeY 1.0; +WEAPONSPAWN - DefaultStateUsage SUF_ACTOR|SUF_OVERLAY|SUF_ITEM; + DefaultStateUsage SUF_ACTOR|SUF_OVERLAY|SUF_WEAPON; } States {