[nexuiz-commits] r6968 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: mand1nga
Date: 2009-06-10 18:40:10 -0400 (Wed, 10 Jun 2009)
New Revision: 6968

Modified:
   trunk/data/qcsrc/server/bots.qc
   trunk/data/qcsrc/server/havocbot.qc
Log:
More fixes for bot command moveto

Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2009-06-10 19:41:06 UTC (rev 6967)
+++ trunk/data/qcsrc/server/bots.qc	2009-06-10 22:40:10 UTC (rev 6968)
@@ -1416,9 +1416,6 @@
 void navigation_poproute()
 {
 	//print("bot ", etos(self), " pop\n");
-	if(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL && self.goalcurrent.owner==self)
-		remove(self.goalcurrent);
-
 	self.goalcurrent = self.goalstack01;
 	self.goalstack01 = self.goalstack02;
 	self.goalstack02 = self.goalstack03;

Modified: trunk/data/qcsrc/server/havocbot.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot.qc	2009-06-10 19:41:06 UTC (rev 6967)
+++ trunk/data/qcsrc/server/havocbot.qc	2009-06-10 22:40:10 UTC (rev 6968)
@@ -1134,6 +1134,7 @@
 		if(self.havocbot_personal_waypoint==world)
 		{
 			dprint("Error: ", self.netname, " trying to walk to a non existent personal waypoint\n");
+			self.aistatus &~= AI_STATUS_WAYPOINT_PERSONAL_GOING;
 			return CMD_STATUS_ERROR;
 		}
 
@@ -1151,6 +1152,7 @@
 			else
 			{
 				dprint("Warning: can't walk to the personal waypoint located at ", vtos(wp.origin),"\n");
+				self.aistatus &~= AI_STATUS_WAYPOINT_PERSONAL_GOING;
 				return CMD_STATUS_ERROR;
 			}
 
@@ -1174,6 +1176,7 @@
 		{
 			// Step 5: Waypoint reached
 			dprint(self.netname, "'s personal waypoint reached\n");
+			remove(self.havocbot_personal_waypoint);
 			self.aistatus &~= AI_STATUS_WAYPOINT_PERSONAL_REACHED;
 			return CMD_STATUS_FINISHED;
 		}
@@ -1200,6 +1203,7 @@
 		if(!self.navigation_hasgoals)
 		{
 			dprint("Warning: can't walk to the personal waypoint located at ", vtos(wp.origin),"\n");
+			self.aistatus &~= AI_STATUS_WAYPOINT_PERSONAL_LINKING;
 			remove(wp);
 			return CMD_STATUS_ERROR;
 		}