From 1e7d1146407a5d6dde817ada79ce428b0cb0f481 Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Fri, 3 Apr 2015 21:55:26 +0200 Subject: Fix a bug in G_Damage. --- src/game/g_combat.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/game') diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 1a54981..c095d1c 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1447,14 +1447,12 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, G_CombatStats_HitMOD( attacker, targ, mod, take ); - if( attacker && attacker->client && take && attacker != targ ) + if( attacker && attacker->client && take && attacker != targ && + attacker->client->bufferedBlobCount < MAX_BUFFERED_BLOBS ) { g_damageBlob_t *blob; int flags = 0; - if( attacker->client->bufferedBlobCount == MAX_BUFFERED_BLOBS ) - return; - if( OnSameTeam( attacker, targ ) || ( targ->s.eType == ET_BUILDABLE && attacker->client->pers.teamSelection == targ->buildableTeam ) ) -- cgit