OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: DFlashFader did some operations in its destructor that had to be moved

Browse source 
to its Destroy method.
- Fixed: Dropped weapons from dying players should not double ammo. 

SVN r935 (trunk)
This commit is contained in:
Christoph Oelckers 2008-04-24 17:17:46 +00:00
commit 29c6615e50
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/p_user.cpp
View file

@ -1109,6 +1109,7 @@ void APlayerPawn::Die (AActor *source, AActor *inflictor)
{
static_cast<AWeapon *>(item)->AmmoGive2 = weap->Ammo2->Amount;
}
item->ItemFlags |= IF_IGNORESKILL;
}
}
else
@ -1117,11 +1118,13 @@ void APlayerPawn::Die (AActor *source, AActor *inflictor)
if (item != NULL)
{
item->Amount = weap->Ammo1->Amount;
item->ItemFlags |= IF_IGNORESKILL;
}
item = P_DropItem (this, weap->AmmoType2, -1, 256);
if (item != NULL)
{
item->Amount = weap->Ammo2->Amount;
item->ItemFlags |= IF_IGNORESKILL;
}
}
}