This is an automated email from the git hooks/post-receive script. smcv pushed a commit to tag 1.51b in repository iortcw.
commit 80c558c591f91d8f57683f86eb345f2eea6f0521 Author: MAN-AT-ARMS <[email protected]> Date: Fri Jul 21 06:56:54 2017 -0400 All: Fix score bonus for defending the flag carrier in CTF Unused: Merge from https://github.com/ioquake/ioq3/commit/c8db6c55e5f2dbf9ee908e6d09bb706281bf5c57 --- MP/code/game/g_team.c | 2 +- SP/code/game/g_team.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MP/code/game/g_team.c b/MP/code/game/g_team.c index 8ffbafc..ee29f08 100644 --- a/MP/code/game/g_team.c +++ b/MP/code/game/g_team.c @@ -275,7 +275,7 @@ void Team_FragBonuses( gentity_t *targ, gentity_t *inflictor, gentity_t *attacke if ( g_gametype.integer < GT_WOLF ) { // JPW NERVE no attacker protect in wolf MP if ( carrier && carrier != attacker ) { VectorSubtract( targ->s.origin, carrier->s.origin, v1 ); - VectorSubtract( attacker->s.origin, carrier->s.origin, v1 ); + VectorSubtract( attacker->s.origin, carrier->s.origin, v2 ); if ( VectorLength( v1 ) < CTF_ATTACKER_PROTECT_RADIUS || VectorLength( v2 ) < CTF_ATTACKER_PROTECT_RADIUS || diff --git a/SP/code/game/g_team.c b/SP/code/game/g_team.c index 064fd26..6724f7b 100644 --- a/SP/code/game/g_team.c +++ b/SP/code/game/g_team.c @@ -247,7 +247,7 @@ void Team_FragBonuses( gentity_t *targ, gentity_t *inflictor, gentity_t *attacke if ( carrier && carrier != attacker ) { VectorSubtract( targ->s.origin, carrier->s.origin, v1 ); - VectorSubtract( attacker->s.origin, carrier->s.origin, v1 ); + VectorSubtract( attacker->s.origin, carrier->s.origin, v2 ); if ( VectorLength( v1 ) < CTF_ATTACKER_PROTECT_RADIUS || VectorLength( v2 ) < CTF_ATTACKER_PROTECT_RADIUS || -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
