OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Tiny cleanup.

Browse source
This commit is contained in:
Mari the Deer 2021-12-01 01:22:44 +01:00
commit 6be8a2f209
2 changed files with 2 additions and 19 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="\chSWWM \czGZ\c- \cw1.2pre r65 \cu(Wed 1 Dec 01:10:07 CET 2021)\c-";
SWWM_SHORTVER="\cw1.2pre r65 \cu(2021-12-01 01:10:07)\c-";
SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r66 \cu(Wed 1 Dec 01:22:44 CET 2021)\c-";
SWWM_SHORTVER="\cw1.2pre r66 \cu(2021-12-01 01:22:44)\c-";

17
zscript/items/swwm_baseammo.zsc
View file

@ -207,17 +207,6 @@ Class SWWMAmmo : Ammo
return Super.HandlePickup(item);
}
override void DoEffect()
{
Super.DoEffect();
// drop excess ammo
if ( !sv_infiniteammo && !Owner.FindInventory('PowerInfiniteAmmo') )
{
int excess = Amount-MaxAmount;
if ( excess > 0 ) CreateTossable(excess);
}
}
override bool CanPickup( Actor toucher )
{
// don't allow picking up ammo for weapons we can't pick up
@ -486,12 +475,6 @@ Class MagAmmo : Inventory abstract
override void DoEffect()
{
Super.DoEffect();
// drop excess ammo
if ( !sv_infiniteammo && !Owner.FindInventory('PowerInfiniteAmmo') )
{
int excess = Amount-MaxAmount;
if ( excess > 0 ) CreateTossable(excess);
}
if ( !pamo )
{
pamo = Ammo(Owner.FindInventory(ParentAmmo));