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

- Fixed: A_JumpIf(InTarget)Inventory jumped if the check amount was greater

Browse source 
than the item's max amount and the item was maxed.


SVN r1783 (trunk)
This commit is contained in:
Randy Heit 2009-09-02 02:35:20 +00:00
parent 78902b2009
commit 6c6ce41b7e
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/rh-log.txt
View file

@ -1,4 +1,6 @@
September 1, 2009 September 1, 2009
- Fixed: A_JumpIf(InTarget)Inventory jumped if the check amount was greater
than the item's max amount and the item was maxed.
- Fixed: Some dmadds wads used zero-length sprites as placeholders. When you - Fixed: Some dmadds wads used zero-length sprites as placeholders. When you
ran dmadds to combine it with the IWAD's sprites, they would be replaced by ran dmadds to combine it with the IWAD's sprites, they would be replaced by
the IWAD's sprites, so when loading such wads, we should ignore those as the IWAD's sprites, so when loading such wads, we should ignore those as

13
src/thingdef/thingdef_codeptr.cpp
View file

@ -506,12 +506,19 @@ void DoJumpIfInventory(AActor * owner, DECLARE_PARAMINFO)
if (!Type || owner == NULL) return; if (!Type || owner == NULL) return;
AInventory * Item=owner->FindInventory(Type); AInventory *Item = owner->FindInventory(Type);
if (Item) if (Item)
{ {
if (ItemAmount>0 && Item->Amount>=ItemAmount) ACTION_JUMP(JumpOffset); if (ItemAmount > 0)
else if (Item->Amount>=Item->MaxAmount) ACTION_JUMP(JumpOffset); {
if (Item->Amount >= ItemAmount)
ACTION_JUMP(JumpOffset);
}
else if (Item->Amount >= Item->MaxAmount)
{
ACTION_JUMP(JumpOffset);
}
} }
} }