OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix weapons in coop allowing for infinite selling.

Browse source
This commit is contained in:
Mari the Deer 2020-08-15 15:03:38 +02:00
commit 04e1864e08
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
language.version
View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \cwGZ\c- r482 (Fri 14 Aug 18:34:08 CEST 2020)";
SWWM_MODVER="\chSWWM \cwGZ\c- r483 (Sat 15 Aug 15:03:38 CEST 2020)";

2
zscript/swwm_inventory.zsc
View file

@ -979,7 +979,7 @@ Class SWWMWeapon : Weapon abstract
override bool HandlePickup( Inventory item )
{
if ( (GetClass() == item.GetClass()) )
if ( (GetClass() == item.GetClass()) && !item.ShouldStay() )
{
int oldammo1 = Ammo1?Ammo1.Amount:0;
int oldammo2 = Ammo2?Ammo2.Amount:0;

2
zscript/swwm_tastytreat.zsc
View file

@ -857,7 +857,7 @@ Class CandyGun : SWWMWeapon
// re-edit to allow picking up spares in coop
override bool HandlePickup( Inventory item )
{
if ( item.GetClass() == GetClass() )
if ( (item.GetClass() == GetClass()) && !item.ShouldStay() )
{
bool ammoget, spareget;
[ammoget, spareget] = CandyGun(item).PickupForAmmoAndSpares(self);