OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added TELEFRAG_DAMAGE constant, and changed the two places that still used

Browse source 
1000 as the threshold for god mode damage to use it instead. (Players with
  MF2_INVULNERABLE set already used 1000000 as their threshold.)


SVN r1755 (trunk)
This commit is contained in:
Randy Heit 2009-08-07 03:57:03 +00:00
commit 16846fe36d
12 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/p_mobj.cpp
View file

@ -1098,7 +1098,7 @@ bool AActor::Massacre ()
do
{
prevhealth = health;
P_DamageMobj (this, NULL, NULL, 1000000, NAME_Massacre);
P_DamageMobj (this, NULL, NULL, TELEFRAG_DAMAGE, NAME_Massacre);
}
while (health != prevhealth && health > 0); //abort if the actor wasn't hurt.
return true;
@ -2000,13 +2000,13 @@ void P_MonsterFallingDamage (AActor *mo)
vel = abs(mo->velz);
if (vel > 35*FRACUNIT)
{ // automatic death
damage = 1000000;
damage = TELEFRAG_DAMAGE;
}
else
{
damage = ((vel - (23*FRACUNIT))*6)>>FRACBITS;
}
damage = 1000000; // always kill 'em
damage = TELEFRAG_DAMAGE; // always kill 'em
P_DamageMobj (mo, NULL, NULL, damage, NAME_Falling);
}