OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

On second thought, inherit bDROPPED flag of swapped weapon.

Browse source
This commit is contained in:
Mari the Deer 2022-08-12 09:31:45 +02:00
commit 94e421aca1
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -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-";

6
zscript/weapons/swwm_baseweapon.zsc
View file

@ -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;