[quake3-commits] [ioquake/ioq3] c8db6c: Fix score bonus for defending the flag carrier in ...

[Zack Middleton]

  Branch: refs/heads/master
  Home:   https://github.com/ioquake/ioq3
  Commit: c8db6c55e5f2dbf9ee908e6d09bb706281bf5c57
      https://github.com/ioquake/ioq3/commit/c8db6c55e5f2dbf9ee908e6d09bb706281bf5c57
  Author: Zack Middleton <zack at cloemail.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M code/game/g_team.c

  Log Message:
  -----------
  Fix score bonus for defending the flag carrier in CTF

Fix copy-paste error in the original Quake 3 code. The wrong values
are used for v1 and v2. v2 was previously set to distance of attacker
to flag base; which should be handled already.

The game now gives defense score bonus to player when they frag an
enemy near their team's flag carrier while the player is more than
1000 units from the flag carrier.

This may also fix not giving defense bonus when near carrier due to
checking if carrier and enemy (instead of attacker) are in PVS.

Found by @Razish.


  Commit: 13831f9569f08b18e6762eeab0ae39c753ed2f2f
      https://github.com/ioquake/ioq3/commit/13831f9569f08b18e6762eeab0ae39c753ed2f2f
  Author: Zack Middleton <zack at cloemail.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M code/game/g_team.c

  Log Message:
  -----------
  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.


  Commit: 5f2e4a03c56f916a32c0364ca71c0ef9e004299a
      https://github.com/ioquake/ioq3/commit/5f2e4a03c56f916a32c0364ca71c0ef9e004299a
  Author: Zack Middleton <zack at cloemail.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M code/game/g_team.c

  Log Message:
  -----------
  Add score bonus for defending the flag carrier in 1 Flag CTF

Set flag_pw to neutral flag instead of using CTF value for red or
blue flag so that flag carrier is detected correctly.


Compare: https://github.com/ioquake/ioq3/compare/786f6fc525b7...5f2e4a03c56f