diff --git a/Build/Configurations/Includes/ZDoom_things.cfg b/Build/Configurations/Includes/ZDoom_things.cfg index c0920ed..071ee51 100644 --- a/Build/Configurations/Includes/ZDoom_things.cfg +++ b/Build/Configurations/Includes/ZDoom_things.cfg @@ -826,7 +826,7 @@ zdoom 9994 { - title = "Player uses sector"; + title = "Player uses wall"; class = "SecActUseWall"; } @@ -842,7 +842,7 @@ zdoom arg1 { title = "Green"; - default = 255; + default = 255; } arg2 { diff --git a/Build/Scripting/ZDoom_DECORATE.cfg b/Build/Scripting/ZDoom_DECORATE.cfg index 416ebff..ba18246 100644 --- a/Build/Scripting/ZDoom_DECORATE.cfg +++ b/Build/Scripting/ZDoom_DECORATE.cfg @@ -185,7 +185,7 @@ keywords A_SetRipperLevel = "A_SetRipperLevel(int level)"; A_SetRipMin = "A_SetRipMin(int min)"; A_SetRipMax = "A_SetRipMax(int max)"; - A_SetRoll = "A_SetRoll(float pitch[, int flags = 0[, int pointer = AAPTR_DEFAULT]])"; + A_SetRoll = "A_SetRoll(float roll[, int flags = 0[, int pointer = AAPTR_DEFAULT]])"; A_SetScale = "A_SetScale(float scaleX[, float scaleY = scaleX[, int pointer = AAPTR_DEFAULT]])"; A_SetShadow = "A_SetShadow"; A_SetShootable = "A_SetShootable"; @@ -385,6 +385,22 @@ constants Bounce.Wall:; Bounce.Actor:; Bounce.Actor.Creature:; +//weapon states: + Ready:; + Select:; + Deselect:; + Fire:; + AltFire:; + Hold:; + AltHold:; + Flash:; + AltFlash:; + Reload:; + Zoom:; + User1:; + User2:; + User3:; + User4:; //flow control loop; stop; @@ -667,6 +683,10 @@ constants WRF_NOSECONDARY; WRF_ALLOWRELOAD; WRF_ALLOWZOOM; + WRF_ALLOWUSER1; + WRF_ALLOWUSER2; + WRF_ALLOWUSER3; + WRF_ALLOWUSER4; ZOOM_INSTANT; ZOOM_NOSCALETURNING; CPF_USEAMMO;