OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Autoactivate Eviscerator loader if not pending.

Browse source
This commit is contained in:
Mari the Deer 2020-12-31 08:27:55 +01:00
commit 7f02f5ece5
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
language.version
View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r719 \cu(Thu 31 Dec 00:50:14 CET 2020)";
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r720 \cu(Thu 31 Dec 08:27:55 CET 2020)";

16
zscript/swwm_danmaku.zsc
View file

@ -872,7 +872,13 @@ Class Eviscerator : SWWMWeapon
{
invoker.isfiring = false;
int flg = WRF_ALLOWRELOAD|WRF_ALLOWZOOM|WRF_ALLOWUSER1;
if ( !invoker.chambered ) flg |= WRF_NOFIRE;
if ( !invoker.chambered )
{
flg |= WRF_NOFIRE;
// autoloader
if ( !invoker.pendingload )
invoker.pendingload = true;
}
A_WeaponReady(flg);
if ( player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK) )
invoker.CheckAmmo(EitherFire,true);
@ -883,7 +889,13 @@ Class Eviscerator : SWWMWeapon
{
invoker.isfiring = false;
int flg = WRF_ALLOWRELOAD|WRF_ALLOWZOOM|WRF_ALLOWUSER1;
if ( !invoker.chambered ) flg |= WRF_NOFIRE;
if ( !invoker.chambered )
{
flg |= WRF_NOFIRE;
// autoloader
if ( !invoker.pendingload )
invoker.pendingload = true;
}
A_WeaponReady(flg);
if ( player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK) )
invoker.CheckAmmo(EitherFire,true);