From 7babfd99993fb3bda02501b2e284a5e66c84e755 Mon Sep 17 00:00:00 2001 From: Bryce Hutchings Date: Sat, 6 Apr 2002 20:47:24 +0000 Subject: [PATCH] fall damage bug fix --- reaction/game/g_combat.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/reaction/game/g_combat.c b/reaction/game/g_combat.c index de7785c2..6ee2b20c 100644 --- a/reaction/game/g_combat.c +++ b/reaction/game/g_combat.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.58 2002/04/06 20:47:24 niceass +// fall damage bug fix +// // Revision 1.57 2002/04/03 09:26:47 jbravo // New FF system. Warns and then finally kickbans teamwounders and // teamkillers @@ -1885,12 +1888,11 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, } } - // do the damage if (take) { -// G_Printf("(%d) taken as damage\n",take); -// JBravo: for Damage delt tracking - attacker->client->ps.persistant[PERS_DAMAGE_DELT] += take; + // G_Printf("(%d) taken as damage\n",take); + // JBravo: for Damage delt tracking + if (attacker && attacker->client) attacker->client->ps.persistant[PERS_DAMAGE_DELT] += take; if (instant_dam) { // G_Printf("(%d) instant damage\n",take); targ->health = targ->health - take;