diff options
author | thilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-10-06 14:10:45 +0000 |
---|---|---|
committer | thilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-10-06 14:10:45 +0000 |
commit | 95ceee2a54ae242af4d55c128e5fa831c5ccb81b (patch) | |
tree | 59c49f4f36df00249ab28dd36b978b999293a70d | |
parent | bb45541832c67c488333966bb6de7f4f015c8ff2 (diff) | |
download | ioquake3-aero-95ceee2a54ae242af4d55c128e5fa831c5ccb81b.tar.gz ioquake3-aero-95ceee2a54ae242af4d55c128e5fa831c5ccb81b.zip |
Don't award assist bonuses to flag capturing player, https://bugzilla.icculus.org/show_bug.cgi?id=3260
git-svn-id: svn://svn.icculus.org/quake3/trunk@1644 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r-- | code/game/g_team.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/code/game/g_team.c b/code/game/g_team.c index ca5341d..4bcd5bd 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 != |