OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r54 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2006-04-18 22:15:05 +00:00
commit 8e631eca0b
16 changed files with 120 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_conversation.cpp
View file

@ -984,6 +984,11 @@ static void PickConversationReply ()
level.total_items--;
item->flags &= ~MF_COUNTITEM;
}
if (item->IsA(RUNTIME_CLASS(AFlameThrower)))
{
// The flame thrower gives less ammo when given in a dialog
static_cast<AWeapon*>(item)->AmmoGive1 = 40;
}
item->flags |= MF_DROPPED;
if (!item->TryPickup (players[consoleplayer].mo))
{