From 8779b73f1667bd3203d67d8cf31081863320daac Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 30 Apr 2007 15:28:05 +0000 Subject: [PATCH] two simple KH bugs... git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2415 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/havocbot_roles.qc | 3 +++ data/qcsrc/server/keyhunt.qc | 6 ++++++ data/qcsrc/server/keyhunt.qh | 1 + 3 files changed, 10 insertions(+) diff --git a/data/qcsrc/server/havocbot_roles.qc b/data/qcsrc/server/havocbot_roles.qc index 988b38d4f..2cc004c55 100644 --- a/data/qcsrc/server/havocbot_roles.qc +++ b/data/qcsrc/server/havocbot_roles.qc @@ -520,6 +520,9 @@ void(float ratingscale_team, float ratingscale_dropped, float ratingscale_enemy) { if(head.owner == self) continue; + if(!kh_tracking_enabled) + if(!head.owner || head.team == self.team) + continue; // skip what I can't see if(!head.owner) navigation_routerating(head, ratingscale_dropped); else if(head.team == self.team) diff --git a/data/qcsrc/server/keyhunt.qc b/data/qcsrc/server/keyhunt.qc index eab1c644d..64dcdb0f6 100644 --- a/data/qcsrc/server/keyhunt.qc +++ b/data/qcsrc/server/keyhunt.qc @@ -518,6 +518,12 @@ float kh_KeyCarrier_waypointsprite_for_player(entity e) if(!kh_tracking_enabled) return 0; + // e is no key carrier: simple case... + if(!e.kh_next) + return kh_GetCarrierSprite(self.team); + + // e is a key carrier: if any key is dropped or owned by another team, show + // the carrier sprite; otherwise show run here FOR_EACH_KH_KEY(key) if(!key.owner || key.team != e.team) { diff --git a/data/qcsrc/server/keyhunt.qh b/data/qcsrc/server/keyhunt.qh index c97f2e614..fcd93d07a 100644 --- a/data/qcsrc/server/keyhunt.qh +++ b/data/qcsrc/server/keyhunt.qh @@ -1,4 +1,5 @@ float kh_teams; +float kh_tracking_enabled; void kh_Log(); void kh_Scores_Event(entity player, entity key, string what, float frags_player, float frags_owner); -- 2.39.2