From: Mario <mario.mario@y7mail.com>
Date: Wed, 11 Sep 2013 08:22:46 +0000 (+1000)
Subject: Clean up stalemate waypoints a bit
X-Git-Tag: xonotic-v0.8.1~29^2~39
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6a021cf19d1f2a9f35a0b032acf9890a28cd457d;p=xonotic%2Fxonotic-data.pk3dir.git

Clean up stalemate waypoints a bit
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 250b2cba5..ea9f31f28 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -137,20 +137,20 @@ float ctf_IsDifferentTeam(entity a, entity b)
 	return (autocvar_g_ctf_reverse) ? !f : f;
 }
 
-float ctf_Stalemate_waypointsprite_visible_for_player(entity e)
+float ctf_Stalemate_customizeentityforclient()
 {
-	// personal waypoints
-	if(self.enemy)
-		if(self.enemy != e)
-			return FALSE;
-			
+	// make spectators see what the player would see
+	entity e, wp_owner;
+	e = WaypointSprite_getviewentity(other);
+	wp_owner = self.owner;
+		
 	// team waypoints
-	if(self.rule == SPRITERULE_DEFAULT)
-	if(ctf_IsDifferentTeam(self.owner.flagcarried, self.owner))
-	if(ctf_IsDifferentTeam(self.owner.flagcarried, e))
-	if(!IsDifferentTeam(self.owner, e) || !IS_PLAYER(e))
+	if(!ctf_IsDifferentTeam(wp_owner.flagcarried, wp_owner))
 		return FALSE;
-
+		
+	if not(IS_PLAYER(e))
+		return FALSE;
+		
 	return TRUE;
 }
 
@@ -679,7 +679,7 @@ void ctf_CheckStalemate(void)
 			if((tmp_entity.owner) && (!tmp_entity.owner.wps_enemyflagcarrier))
 			{
 				WaypointSprite_Spawn("enemyflagcarrier", 0, 0, tmp_entity.owner, FLAG_WAYPOINT_OFFSET, world, 0, tmp_entity.owner, wps_enemyflagcarrier, TRUE, RADARICON_FLAG, WPCOLOR_ENEMYFC(tmp_entity.owner.team));
-				tmp_entity.owner.wps_enemyflagcarrier.waypointsprite_visible_for_player = ctf_Stalemate_waypointsprite_visible_for_player;
+				tmp_entity.owner.wps_enemyflagcarrier.customizeentityforclient = ctf_Stalemate_customizeentityforclient;
 			}
 		}
 		
@@ -1409,7 +1409,7 @@ void havocbot_role_ctf_carrier()
 		{
 			// Can't navigate to my own base, suicide!
 			// TODO: drop it and wander around
-			Damage(self, self, self, 100000, DEATH_KILL, self.origin, '0 0 0');
+			//Damage(self, self, self, 100000, DEATH_KILL, self.origin, '0 0 0');
 			return;
 		}
 	}