summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/p_inter.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c
index b6138f32..bd56cbed 100644
--- a/src/strife/p_inter.c
+++ b/src/strife/p_inter.c
@@ -1288,8 +1288,10 @@ void P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source, int damage)
damage -= saved;
}
player->health -= damage; // mirror mobj health here for Dave
- if(player->health < 0)
- player->health = 0;
+
+ // [STRIFE] haleyjd 20130302: bug fix - this is *not* capped here.
+ //if(player->health < 0)
+ // player->health = 0;
player->attacker = source;
player->damagecount += damage; // add damage after armor / invuln