- fixed parser for state block options.

- fixed incorrect flags for weapons.
2016-11-14 20:00:01 +01:00 · 2016-11-14 20:00:01 +01:00 · c797319314
parent 7bcd83f0c1
commit c797319314
2 changed files with 1 additions and 2 deletions
--- 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);
--- 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
 	{