zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: sv_unlimited_pickup did not work with the flechette.

Browse source 
SVN r3727 (trunk)
This commit is contained in:
Randy Heit 2012-07-01 22:47:13 +00:00
parent 8f39e692e7
commit e800522e26
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/g_hexen/a_flechette.cpp
View file

@ -14,6 +14,8 @@
#include "g_level.h" #include "g_level.h"
*/ */
EXTERN_CVAR(Bool, sv_unlimited_pickup)
static FRandom pr_poisonbag ("PoisonBag"); static FRandom pr_poisonbag ("PoisonBag");
static FRandom pr_poisoncloud ("PoisonCloud"); static FRandom pr_poisoncloud ("PoisonCloud");
static FRandom pr_poisoncloudd ("PoisonCloudDamage"); static FRandom pr_poisoncloudd ("PoisonCloudDamage");
@ -239,10 +241,10 @@ bool AArtiPoisonBag::HandlePickup (AInventory *item)
if (GetClass() == GetFlechetteType(Owner)) if (GetClass() == GetFlechetteType(Owner))
{ {
if (Amount < MaxAmount) if (Amount < MaxAmount || sv_unlimited_pickup)
{ {
Amount += item->Amount; Amount += item->Amount;
if (Amount > MaxAmount) if (Amount > MaxAmount && !sv_unlimited_pickup)
{ {
Amount = MaxAmount; Amount = MaxAmount;
} }