From de9cf465cc10cf67d4b8473255d26072f9cad05c Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Tue, 6 Oct 2009 14:10:45 +0000 Subject: [PATCH] Don't award assist bonuses to flag capturing player, https://bugzilla.icculus.org/show_bug.cgi?id=3260 --- code/game/g_team.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/g_team.c b/code/game/g_team.c index ca5341d0..4bcd5bd6 100644 --- a/code/game/g_team.c +++ b/code/game/g_team.c @@ -770,7 +770,9 @@ int Team_TouchOurFlag( gentity_t *ent, gentity_t *other, int team ) { // Ok, let's do the player loop, hand out the bonuses for (i = 0; i < g_maxclients.integer; i++) { player = &g_entities[i]; - if (!player->inuse) + + // also make sure we don't award assist bonuses to the flag carrier himself. + if (!player->inuse || player == other) continue; if (player->client->sess.sessionTeam !=