From 7f02f5ece56472d991d9ccc4ddbb9edd57f6637a Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 31 Dec 2020 08:27:55 +0100 Subject: [PATCH] Autoactivate Eviscerator loader if not pending. --- language.version | 2 +- zscript/swwm_danmaku.zsc | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 9c69071ec..5c4d70dcc 100644 --- a/language.version +++ b/language.version @@ -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)"; diff --git a/zscript/swwm_danmaku.zsc b/zscript/swwm_danmaku.zsc index d344a9d4c..2141f4cb3 100644 --- a/zscript/swwm_danmaku.zsc +++ b/zscript/swwm_danmaku.zsc @@ -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);