This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository ioquake3.
commit 13831f9569f08b18e6762eeab0ae39c753ed2f2f
Author: Zack Middleton <z...@cloemail.com>
Date: Fri Jul 14 17:06:22 2017 -0500
Restore not giving defense score bonus to flag carrier
The Team Arena code for giving defense bonus for fragging player
who recently damaged a skull carrier unintentionally applied to
the flag carrier.
The skull carrier case would of been handled by the flag carrier
block above it. However, Harvest mode doesn't call
Team_CheckHurtCarrier() so the skull carrier defense bonus does
not work.
This restores the pre-Team Arena behavior of not giving defense
score bonus to flag carrier.
---
code/game/g_team.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/code/game/g_team.c b/code/game/g_team.c
index e736a4a..de81e52 100644
--- a/code/game/g_team.c
+++ b/code/game/g_team.c
@@ -365,23 +365,6 @@ void Team_FragBonuses(gentity_t *targ, gentity_t
*inflictor, gentity_t *attacker
return;
}
- if (targ->client->pers.teamState.lasthurtcarrier &&
- level.time - targ->client->pers.teamState.lasthurtcarrier <
CTF_CARRIER_DANGER_PROTECT_TIMEOUT) {
- // attacker is on the same team as the skull carrier and
- AddScore(attacker, targ->r.currentOrigin,
CTF_CARRIER_DANGER_PROTECT_BONUS);
-
- attacker->client->pers.teamState.carrierdefense++;
- targ->client->pers.teamState.lasthurtcarrier = 0;
-
- attacker->client->ps.persistant[PERS_DEFEND_COUNT]++;
- // add the sprite over the player's head
- attacker->client->ps.eFlags &= ~(EF_AWARD_IMPRESSIVE |
EF_AWARD_EXCELLENT | EF_AWARD_GAUNTLET | EF_AWARD_ASSIST | EF_AWARD_DEFEND |
EF_AWARD_CAP );
- attacker->client->ps.eFlags |= EF_AWARD_DEFEND;
- attacker->client->rewardTime = level.time + REWARD_SPRITE_TIME;
-
- return;
- }
-
// flag and flag carrier area defense bonuses
// we have to find the flag and carrier entities
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
