diff --git a/language.version b/language.version index a91979e30..90aba9ebc 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1002 \cu(Tue 7 Nov 14:48:33 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1002 \cu(2023-11-07 14:48:33)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1004 \cu(Wed 8 Nov 21:34:44 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r1004 \cu(2023-11-08 21:34:44)\c-"; diff --git a/zscript/swwm_gesture.zsc b/zscript/swwm_gesture.zsc index 25e5818a0..7a57526e6 100644 --- a/zscript/swwm_gesture.zsc +++ b/zscript/swwm_gesture.zsc @@ -45,6 +45,13 @@ Class SWWMGesture : SWWMWeapon { return false; } + override bool Used( Actor user ) + { + return false; + } + override void Touch( Actor toucher ) + { + } override void DoEffect() { Super.DoEffect(); @@ -108,7 +115,7 @@ Class SWWMGesture : SWWMWeapon if ( !w ) { w = SWWMGesture(Spawn("SWWMGesture")); - mo.AddInventory(w); + w.AttachToOwner(mo); } if ( mo.player.PendingWeapon != WP_NOCHANGE ) w.formerweapon = mo.player.PendingWeapon; else w.formerweapon = mo.player.ReadyWeapon; @@ -143,7 +150,7 @@ Class SWWMGesture : SWWMWeapon if ( !w ) { w = SWWMGesture(Spawn("SWWMGesture")); - mo.AddInventory(w); + w.AttachToOwner(mo); } if ( mo.player.PendingWeapon != WP_NOCHANGE ) w.formerweapon = mo.player.PendingWeapon; else w.formerweapon = mo.player.ReadyWeapon; @@ -423,7 +430,7 @@ Class SWWMGesture : SWWMWeapon if ( !g ) { g = SWWMItemGesture(Spawn(invoker.whichweapon)); - AddInventory(g); + g.AttachToOwner(self); } g.gest = invoker; player.ReadyWeapon = g; @@ -668,6 +675,13 @@ Class SWWMItemGesture : SWWMWeapon abstract { return false; } + override bool Used( Actor user ) + { + return false; + } + override void Touch( Actor toucher ) + { + } override void DoEffect() { Super.DoEffect();