From 9fab5f3b2cd40213cd129aef84e9323a8a04d60f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 21 Dec 2018 08:59:37 +0100 Subject: [PATCH] - fixed: For an initial weapon pickup, sv_unlimited_pickup wasn't checked for the included ammo. --- wadsrc/static/zscript/inventory/weapons.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wadsrc/static/zscript/inventory/weapons.txt b/wadsrc/static/zscript/inventory/weapons.txt index 7eebdf3dc..25817d8ce 100644 --- a/wadsrc/static/zscript/inventory/weapons.txt +++ b/wadsrc/static/zscript/inventory/weapons.txt @@ -717,10 +717,10 @@ class Weapon : StateProvider ammoitem.Amount = MIN (amount, ammoitem.MaxAmount); ammoitem.AttachToOwner (other); } - else if (ammoitem.Amount < ammoitem.MaxAmount) + else if (ammoitem.Amount < ammoitem.MaxAmount || sv_unlimited_pickup) { ammoitem.Amount += amount; - if (ammoitem.Amount > ammoitem.MaxAmount) + if (ammoitem.Amount > ammoitem.MaxAmount && !sv_unlimited_pickup) { ammoitem.Amount = ammoitem.MaxAmount; }