TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix lifetime kill accounting in team hoard

Browse source 
`adjust` must be set to -1 for a team kill, but this was only done as a
side effect of updating game-local kill counts.  After 5f2ec67,
game-local kill counts are not updated in team hoard, but adjust is
still used.  Move the handling of adjust up to occur in all team games.

Fixes: 5f2ec6789f ("Restore !hoard guard for game-local kill accounting")
This commit is contained in:
Kp 2015-12-13 18:00:49 +00:00
parent fd3f7f7f4d
commit a1cf7b03fe
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
similar/main/multi.cpp
View file

@ -816,14 +816,26 @@ static void multi_compute_kill(const objptridx_t killer, const vobjptridx_t kill
else
{
short adjust = 1;
/* Dead stores to prevent bogus -Wmaybe-uninitialized warnings
* when the optimization level prevents the compiler from
* recognizing that these are written in a team game and only
* read in a team game.
*/
unsigned killed_team = 0, killer_team = 0;
DXX_MAKE_VAR_UNDEFINED(killed_team);
DXX_MAKE_VAR_UNDEFINED(killer_team);
const auto is_team_game = Game_mode & GM_TEAM;
if (is_team_game)
{
killed_team = get_team(killed_pnum);
killer_team = get_team(killer_pnum);
if (killed_team == killer_team)
adjust = -1;
}
if (!game_mode_hoard())
{
if (Game_mode & GM_TEAM)
if (is_team_game)
{
const auto killed_team = get_team(killed_pnum);
const auto killer_team = get_team(killer_pnum);
if (killed_team == killer_team)
adjust = -1;
team_kills[killer_team] += adjust;
Players[killer_pnum].net_kills_total += adjust;
Players[killer_pnum].KillGoalCount += adjust;