From 94e421aca13601e88b361e1da07a70ca046e4ca3 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Fri, 12 Aug 2022 09:31:45 +0200 Subject: [PATCH] On second thought, inherit bDROPPED flag of swapped weapon. --- language.version | 4 ++-- zscript/weapons/swwm_baseweapon.zsc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/language.version b/language.version index bb1f89492..cf00d4339 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r305 \cu(Fri 12 Aug 01:24:51 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r305 \cu(2022-08-12 01:24:51)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r306 \cu(Fri 12 Aug 09:31:45 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r306 \cu(2022-08-12 09:31:45)\c-"; diff --git a/zscript/weapons/swwm_baseweapon.zsc b/zscript/weapons/swwm_baseweapon.zsc index f56691fcb..ca5629a2a 100644 --- a/zscript/weapons/swwm_baseweapon.zsc +++ b/zscript/weapons/swwm_baseweapon.zsc @@ -114,7 +114,7 @@ Class SWWMWeapon : Weapon abstract { // create a dual giver let dg = SWWMDualWeaponGiver(Spawn("SWWMDualWeaponGiver",pos)); - dg.bDROPPED = false; + dg.bDROPPED = bDROPPED; // inherit drop flag dg.angle = angle; dg.vel = vel; dg.FloatBobPhase = FloatBobPhase; @@ -129,7 +129,7 @@ Class SWWMWeapon : Weapon abstract { // swap in-place let d = user.DropInventory(sw); - d.bDROPPED = false; + d.bDROPPED = bDROPPED; // inherit drop flag d.SetOrigin(pos,false); d.angle = angle; d.vel = vel; @@ -709,7 +709,7 @@ Class SWWMDualWeaponGiver : Inventory if ( !giveme[1].CallTryPickup(toucher) ) giveme[1].Destroy(); // drop the other where we stand giveme[0].BecomePickup(); - giveme[0].bDROPPED = false; + giveme[0].bDROPPED = bDROPPED; giveme[0].SetOrigin(pos,false); giveme[0].Angle = Angle; giveme[0].Vel = Vel;