From b6557a82ffa36001238f6c72b6b310163cf91e4c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 28 Dec 2009 00:07:04 +0000 Subject: [PATCH] - added Hirogen2's Backpack fix for sv_unlimited_pickup. SVN r2054 (trunk) --- docs/rh-log.txt | 1 + src/g_shared/a_pickups.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 0c96f07a5..089076e0a 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,5 @@ December 27, 2009 (Changes by Graf Zahl) +- added Hirogen2's Backpack fix for sv_unlimited_pickup. - added a linedef based method to define portals. Portals defined this way still have the same limitations as those defines with the portal things. diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp index 201d83e5f..194618933 100644 --- a/src/g_shared/a_pickups.cpp +++ b/src/g_shared/a_pickups.cpp @@ -1638,7 +1638,7 @@ bool ABackpackItem::HandlePickup (AInventory *item) { if (probe->GetClass()->ParentClass == RUNTIME_CLASS(AAmmo)) { - if (probe->Amount < probe->MaxAmount) + if (probe->Amount < probe->MaxAmount || sv_unlimited_pickup) { int amount = static_cast(probe->GetDefault())->BackpackAmount; // extra ammo in baby mode and nightmare mode @@ -1647,7 +1647,7 @@ bool ABackpackItem::HandlePickup (AInventory *item) amount = FixedMul(amount, G_SkillProperty(SKILLP_AmmoFactor)); } probe->Amount += amount; - if (probe->Amount > probe->MaxAmount) + if (probe->Amount > probe->MaxAmount && !sv_unlimited_pickup) { probe->Amount = probe->MaxAmount; }