OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r37 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2006-04-13 16:52:24 +00:00
commit fdeb374fdb
14 changed files with 148 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/p_conversation.cpp
View file

@ -957,29 +957,38 @@ static void PickConversationReply ()
takestuff = true;
if (reply->GiveType != NULL)
{
if (reply->GiveType->IsDescendantOf(RUNTIME_CLASS(AWeapon)))
if (reply->GiveType->IsDescendantOf(RUNTIME_CLASS(AInventory)))
{
if (players[consoleplayer].mo->FindInventory(reply->GiveType) != NULL)
if (reply->GiveType->IsDescendantOf(RUNTIME_CLASS(AWeapon)))
{
takestuff = false;
if (players[consoleplayer].mo->FindInventory(reply->GiveType) != NULL)
{
takestuff = false;
}
}
if (takestuff)
{
AInventory *item = static_cast<AInventory *> (Spawn (reply->GiveType, 0, 0, 0));
// Items given here should not count as items!
if (item->flags & MF_COUNTITEM)
{
level.total_items--;
item->flags &= ~MF_COUNTITEM;
}
item->flags |= MF_DROPPED;
if (!item->TryPickup (players[consoleplayer].mo))
{
item->Destroy ();
takestuff = false;
}
}
}
if (takestuff)
else
{
AInventory *item = static_cast<AInventory *> (Spawn (reply->GiveType, 0, 0, 0));
// Items given here should not count as items!
if (item->flags & MF_COUNTITEM)
{
level.total_items--;
item->flags &= ~MF_COUNTITEM;
}
item->flags |= MF_DROPPED;
if (!item->TryPickup (players[consoleplayer].mo))
{
item->Destroy ();
takestuff = false;
}
// Trying to give a non-inventory item.
takestuff = false;
Printf("Attempting to give non-inventory item %s\n", reply->GiveType->Name+1);
}
}