r1771 - branches/nexuiz-2.0/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-07-23 11:06:35 -0400 (Sun, 23 Jul 2006)
New Revision: 1771

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc
Log:
thou shalt not catch yer own tail ;)


Modified: branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc	2006-07-23 15:05:10 UTC (rev 1770)
+++ branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc	2006-07-23 15:06:35 UTC (rev 1771)
@@ -68,10 +68,15 @@
 	local entity head;
 	local float t, noteam;
 	ratingscale = ratingscale * 1200;
-	noteam = self.team == 0 || teamplay == 0;
+	noteam = ((self.team == 0) || (teamplay == 0)); // fteqcc sucks
+	//dprint("teamplay is "); dprint(ftos(teamplay)); dprint(", own team is ");
+	//dprint(ftos(self.team)); dprint(" -> noteam is "); dprint(ftos(noteam));
+	//dprint("\n");
+
 	head = findchain(classname, "player");
 	while (head)
 	{
+		if (self != head)
 		if (head.health > 0)
 		if ((noteam && (!bot_ignore_bots || clienttype(head) == CLIENTTYPE_REAL)) || head.team != self.team)
 		if (vlen(head.origin - org) < sradius)
@@ -81,7 +86,10 @@
 				t = 1;
 			t = t / (head.health + head.armortype * head.armorvalue);
 			if (t > 0)
+			{
+				//dprint("found: "); dprint(head.netname); dprint("\n");
 				navigation_routerating(head, t * ratingscale);
+			}
 		}
 		head = head.chain;
 	}