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

Treat hoard non-player kills as bad kills

Browse source
This commit is contained in:
Kp 2015-11-26 02:56:56 +00:00
parent 90fdcfe846
commit 8fe9261aaf
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
similar/main/object.cpp
View file

@ -1495,9 +1495,12 @@ static void start_player_death_sequence(const vobjptr_t player)
if (killer_objnum == object_none)
/* Non-player kill */
return true;
const auto &&killer_objp = vobjptr(killer_objnum);
if (killer_objp->type != OBJ_PLAYER)
return true;
if (!(Game_mode & GM_TEAM))
return false;
return get_team(Player_num) == get_team(get_player_id(vobjptr(killer_objnum)));
return get_team(Player_num) == get_team(get_player_id(killer_objp));
};
if (!is_bad_kill())
++ get_local_player_secondary_ammo()[PROXIMITY_INDEX];