r3465 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: lordhavoc
Date: 2008-03-01 07:59:04 -0500 (Sat, 01 Mar 2008)
New Revision: 3465

Modified:
   trunk/data/qcsrc/server/ctf.qc
   trunk/data/qcsrc/server/havocbot_roles.qc
Log:
renamed flaglist to ctf_worldflaglist
changed flag.enemy to flag.ctf_worldflagnext


Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2008-03-01 12:55:00 UTC (rev 3464)
+++ trunk/data/qcsrc/server/ctf.qc	2008-03-01 12:59:04 UTC (rev 3465)
@@ -1,5 +1,6 @@
 .entity sprite;
-entity flaglist; // CTF flags in the map
+entity ctf_worldflaglist; // CTF flags in the map
+.entity ctf_worldflagnext;
 
 .float next_take_time;			// the next time a player can pick up a flag (time + blah)
 								/// I used this, in part, to fix the looping score bug. - avirox
@@ -464,9 +465,9 @@
 	//if(!cvar("teamplay"))
 	//	cvar_set("teamplay", "3");
 
-	// link flag into flaglist
-	self.enemy = flaglist;
-	flaglist = self;
+	// link flag into ctf_worldflaglist
+	self.ctf_worldflagnext = ctf_worldflaglist;
+	ctf_worldflaglist = self;
 
 	self.classname = "item_flag_team";
 	self.team = COLOR_TEAM1; // color 4 team (red)
@@ -529,9 +530,9 @@
 	//if(!cvar("teamplay"))
 	//	cvar_set("teamplay", "3");
 
-	// link flag into flaglist
-	self.enemy = flaglist;
-	flaglist = self;
+	// link flag into ctf_worldflaglist
+	self.ctf_worldflagnext = ctf_worldflaglist;
+	ctf_worldflaglist = self;
 
 	self.classname = "item_flag_team";
 	self.team = COLOR_TEAM2; // color 13 team (blue)
@@ -670,11 +671,11 @@
 
 	if (g_ctf) {
 		local entity flag;
-		flag = flaglist;
+		flag = ctf_worldflaglist;
 		while (flag)
 		{
 			ctf_setstatus2(flag);
-			flag = flag.enemy;
+			flag = flag.ctf_worldflagnext;
 		}
 	}
 };

Modified: trunk/data/qcsrc/server/havocbot_roles.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot_roles.qc	2008-03-01 12:55:00 UTC (rev 3464)
+++ trunk/data/qcsrc/server/havocbot_roles.qc	2008-03-01 12:59:04 UTC (rev 3465)
@@ -125,16 +125,17 @@
 	}
 };
 
-entity flaglist;
+entity ctf_worldflaglist;
+.entity ctf_worldflagnext;
 void(float ratingscale) havocbot_goalrating_ctf_ourflag =
 {
 	local entity head;
-	head = flaglist;
+	head = ctf_worldflaglist;
 	while (head)
 	{
 		if (self.team == head.team)
 			break;
-		head = head.enemy;
+		head = head.ctf_worldflagnext;
 	}
 	if (head)
 		navigation_routerating(head, ratingscale, 10000);
@@ -143,12 +144,12 @@
 void(float ratingscale) havocbot_goalrating_ctf_enemyflag =
 {
 	local entity head;
-	head = flaglist;
+	head = ctf_worldflaglist;
 	while (head)
 	{
 		if (self.team != head.team)
 			break;
-		head = head.enemy;
+		head = head.ctf_worldflagnext;
 	}
 	if (head)
 		navigation_routerating(head, ratingscale, 10000);
@@ -162,12 +163,12 @@
 void(float ratingscale) havocbot_goalrating_ctf_ourstolenflag =
 {
 	local entity head;
-	head = flaglist;
+	head = ctf_worldflaglist;
 	while (head)
 	{
 		if (self.team == head.team)
 			break;
-		head = head.enemy;
+		head = head.ctf_worldflagnext;
 	}
 	if (head)
 	if (head.cnt != FLAG_BASE)
@@ -177,12 +178,12 @@
 void(float ratingscale) havocbot_goalrating_ctf_droppedflags =
 {
 	local entity head;
-	head = flaglist;
+	head = ctf_worldflaglist;
 	while (head)
 	{
 		if (head.cnt != FLAG_BASE) // flag is carried or out in the field
 			navigation_routerating(head, ratingscale, 10000);
-		head = head.enemy;
+		head = head.ctf_worldflagnext;
 	}
 };
 
@@ -252,12 +253,12 @@
 		return;
 	}
 	// check our flag
-	f = flaglist;
+	f = ctf_worldflaglist;
 	while (f)
 	{
 		if (self.team == f.team)
 			break;
-		f = f.enemy;
+		f = f.ctf_worldflagnext;
 	}
 	if (f.cnt != FLAG_BASE && canreach(f))
 	{
@@ -306,12 +307,12 @@
 		return;
 	}
 	// check our flag
-	f = flaglist;
+	f = ctf_worldflaglist;
 	while (f)
 	{
 		if (self.team == f.team)
 			break;
-		f = f.enemy;
+		f = f.ctf_worldflagnext;
 	}
 	if (f.cnt == FLAG_BASE)
 	{
@@ -351,12 +352,12 @@
 		return;
 	}
 	// check our flag
-	f = flaglist;
+	f = ctf_worldflaglist;
 	while (f)
 	{
 		if (self.team == f.team)
 			break;
-		f = f.enemy;
+		f = f.ctf_worldflagnext;
 	}
 	if (f.cnt != FLAG_BASE && canreach(f))
 	{
@@ -414,12 +415,12 @@
 		return;
 	}
 	// check our flag
-	f = flaglist;
+	f = ctf_worldflaglist;
 	while (f)
 	{
 		if (self.team == f.team)
 			break;
-		f = f.enemy;
+		f = f.ctf_worldflagnext;
 	}
 	if (f.cnt != FLAG_BASE && canreach(f))
 	{