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

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
commit 6c6ce41b7e
2 changed files with 12 additions and 3 deletions

View file

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