From 949ae86e8f4061508ca5bf67e076e2b62db616e9 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 13 May 2021 23:25:43 +0200 Subject: [PATCH] Fix incorrect mag position when switching away from Hellblazer. --- language.version | 4 ++-- zscript/weapons/swwm_blazeit.zsc | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/language.version b/language.version index 5aeae53ea..836317c19 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r479 \cu(Thu 13 May 22:46:23 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r479 \cu(2021-05-13 22:46:23)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r480 \cu(Thu 13 May 23:25:43 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r480 \cu(2021-05-13 23:25:43)\c-"; diff --git a/zscript/weapons/swwm_blazeit.zsc b/zscript/weapons/swwm_blazeit.zsc index af1c58751..00f09b47e 100644 --- a/zscript/weapons/swwm_blazeit.zsc +++ b/zscript/weapons/swwm_blazeit.zsc @@ -841,7 +841,6 @@ Class Hellblazer : SWWMWeapon XZW2 A 10 A_StartSound("hellblazer/preload",CHAN_WEAPON,CHANF_OVERLAP); XZW2 A 2 { - invoker.spinskipped--; invoker.magpos = (invoker.magpos+1)%6; invoker.preload++; A_GlassOverlay("Cycle_G1"); @@ -863,7 +862,6 @@ Class Hellblazer : SWWMWeapon XZW6 V 10 A_StartSound("hellblazer/preload",CHAN_WEAPON,CHANF_OVERLAP); XZW6 V 2 { - invoker.spinskipped--; invoker.magpos = (invoker.magpos+1)%3; invoker.preload++; A_GlassOverlay("Cycle_G2"); @@ -886,7 +884,6 @@ Class Hellblazer : SWWMWeapon XZW2 A 10 A_StartSound("hellblazer/preload",CHAN_WEAPON,CHANF_OVERLAP); XZW2 A 2 { - invoker.spinskipped--; invoker.magpos = (invoker.magpos+1)%6; invoker.preload++; A_GlassOverlay("Cycle_G1"); @@ -908,7 +905,6 @@ Class Hellblazer : SWWMWeapon XZW6 V 10 A_StartSound("hellblazer/preload",CHAN_WEAPON,CHANF_OVERLAP); XZW6 V 2 { - invoker.spinskipped--; invoker.magpos = (invoker.magpos+1)%3; invoker.preload++; A_GlassOverlay("Cycle_G2");