From d6b8603cb6a762889a3586619e4a7ef7bea4fe14 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@users.noreply.github.com>
Date: Wed, 22 Apr 2015 22:27:56 -0500
Subject: [PATCH] Ignore sv_unlimited_pickup on items that stay

- See http://forum.zdoom.org/viewtopic.php?f=2&t=47790
---
 src/g_shared/a_pickups.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp
index 2888ea2b6..5eda53ad6 100644
--- a/src/g_shared/a_pickups.cpp
+++ b/src/g_shared/a_pickups.cpp
@@ -593,7 +593,7 @@ bool AInventory::HandlePickup (AInventory *item)
 {
 	if (item->GetClass() == GetClass())
 	{
-		if (Amount < MaxAmount || sv_unlimited_pickup)
+		if (Amount < MaxAmount || (sv_unlimited_pickup && !item->ShouldStay()))
 		{
 			if (Amount > 0 && Amount + item->Amount < 0)
 			{