OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into json

Browse source
This commit is contained in:
Christoph Oelckers 2016-09-22 09:09:48 +02:00
commit f0e8e860f1
21 changed files with 113 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/g_shared/a_weapons.cpp
View file

@ -239,6 +239,10 @@ bool AWeapon::HandlePickup (AInventory *item)
{
item->ItemFlags |= IF_PICKUPGOOD;
}
if (MaxAmount > 1) //[SP] If amount<maxamount do another pickup test of the weapon itself!
{
return Super::HandlePickup (item);
}
return true;
}
if (Inventory != NULL)