zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-20 10:32:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: TakeInventory needs to check for subclasses of PowerInfiniteAmmo.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-27 02:09:56 +01:00
parent c7cf619ff4
commit 3a5124e10e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_mobj.cpp
View file

@ -902,7 +902,7 @@ bool AActor::TakeInventory(PClassActor *itemclass, int amount, bool fromdecorate
// Do not take ammo if the "no take infinite/take as ammo depletion" flag is set // Do not take ammo if the "no take infinite/take as ammo depletion" flag is set
// and infinite ammo is on // and infinite ammo is on
if (notakeinfinite && if (notakeinfinite &&
((dmflags & DF_INFINITE_AMMO) || (player && FindInventory(NAME_PowerInfiniteAmmo))) && item->IsKindOf(NAME_Ammo)) ((dmflags & DF_INFINITE_AMMO) || (player && FindInventory(NAME_PowerInfiniteAmmo, true))) && item->IsKindOf(NAME_Ammo))
{ {
// Nothing to do here, except maybe res = false;? Would it make sense? // Nothing to do here, except maybe res = false;? Would it make sense?
result = false; result = false;