OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added support for damage-specific player pain sounds.

Browse source 
- Removed the constraint that all $playerreserve SNDINFO commands must come
  before the other $player commands.
- Fixed: TArray::Reserve did not construct its newly allocated entries.
- Changed the damage type for drowning from 'Water' to 'Drowning'.


SVN r466 (trunk)
This commit is contained in:
Randy Heit 2007-01-28 04:59:04 +00:00
commit 72c93b479e
13 changed files with 233 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/g_shared/a_armor.cpp
View file

@ -124,7 +124,7 @@ bool ABasicArmor::HandlePickup (AInventory *item)
void ABasicArmor::AbsorbDamage (int damage, FName damageType, int &newdamage)
{
if (damageType != NAME_Water)
if (damageType != NAME_Drowning)
{
int saved = FixedMul (damage, SavePercent);
if (Amount < saved)
@ -440,7 +440,7 @@ bool AHexenArmor::AddArmorToSlot (AActor *actor, int slot, int amount)
void AHexenArmor::AbsorbDamage (int damage, FName damageType, int &newdamage)
{
if (damageType != NAME_Water)
if (damageType != NAME_Drowning)
{
fixed_t savedPercent = Slots[0] + Slots[1] + Slots[2] + Slots[3] + Slots[4];