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

3
src/p_interaction.cpp
View file

@ -221,7 +221,7 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker)
case NAME_Falling: messagename = "OB_FALLING"; break;
case NAME_Crush: messagename = "OB_CRUSH"; break;
case NAME_Exit: messagename = "OB_EXIT"; break;
case NAME_Water: messagename = "OB_WATER"; break;
case NAME_Drowning: messagename = "OB_WATER"; break;
case NAME_Slime: messagename = "OB_SLIME"; break;
case NAME_Fire: if (attacker == NULL) messagename = "OB_LAVA"; break;
}
@ -1024,6 +1024,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
{
player->health = 0;
}
player->LastDamageType = mod;
player->attacker = source;
player->damagecount += damage; // add damage after armor / invuln
if (player->damagecount > 100)