diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-04-03 21:55:26 +0200 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-04-03 21:55:26 +0200 |
| commit | 1e7d1146407a5d6dde817ada79ce428b0cb0f481 (patch) | |
| tree | 897c04c2090f8eb5e17a1f7b63d14f2521eb6d1b /src/game/g_combat.c | |
| parent | 7f984114f2e19b0579e1d55e3c1a8925a88c35d0 (diff) | |
Fix a bug in G_Damage.
Diffstat (limited to 'src/game/g_combat.c')
| -rw-r--r-- | src/game/g_combat.c | 6 |
1 files changed, 2 insertions, 4 deletions
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 ) ) |