OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added buddha cheat.

Browse source 
SVN r1756 (trunk)
This commit is contained in:
Randy Heit 2009-08-07 04:08:38 +00:00
commit f9088bd2cf
8 changed files with 53 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/p_interaction.cpp
View file

@ -1149,9 +1149,20 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
P_AutoUseStrifeHealth (player);
player->mo->health = player->health;
}
if (player->health < 0)
if (player->health <= 0)
{
player->health = 0;
// [SP] Buddha cheat: if the player is about to die, rescue him to 1 health.
// This does not save the player if damage >= TELEFRAG_DAMAGE, still need to
// telefrag him right? ;) (Unfortunately the damage is "absorbed" by armor,
// but telefragging should still do enough damage to kill the player)
if ((player->cheats & CF_BUDDHA) && damage < TELEFRAG_DAMAGE)
{
target->health = player->health = 1;
}
else
{
player->health = 0;
}
}
player->LastDamageType = mod;
player->attacker = source;
@ -1465,18 +1476,25 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage,
target->health -= damage;
if (target->health <= 0)
{ // Death
target->special1 = damage;
if (player && inflictor && !player->morphTics)
{ // Check for flame death
if ((inflictor->DamageType == NAME_Fire)
&& (target->health > -50) && (damage > 25))
{
target->DamageType = NAME_Fire;
if ( player->cheats & CF_BUDDHA )
{ // [SP] Save the player...
player->health = target->health = 1;
}
else
{
target->special1 = damage;
if (player && inflictor && !player->morphTics)
{ // Check for flame death
if ((inflictor->DamageType == NAME_Fire)
&& (target->health > -50) && (damage > 25))
{
target->DamageType = NAME_Fire;
}
else target->DamageType = inflictor->DamageType;
}
else target->DamageType = inflictor->DamageType;
target->Die (source, source);
return;
}
target->Die (source, source);
return;
}
if (!(level.time&63) && playPainSound)
{