From 8fe9261aaf70f7bb08a63782be37814cf70e4c87 Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 26 Nov 2015 02:56:56 +0000 Subject: [PATCH] Treat hoard non-player kills as bad kills --- similar/main/object.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/similar/main/object.cpp b/similar/main/object.cpp index ba5d8305d..86d30dcc6 100644 --- a/similar/main/object.cpp +++ b/similar/main/object.cpp @@ -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];