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

[DONOTREPLY at icculus.org]

Author: mand1nga
Date: 2009-04-27 19:56:59 -0400 (Mon, 27 Apr 2009)
New Revision: 6599

Modified:
   trunk/data/qcsrc/server/bots.qc
   trunk/data/qcsrc/server/havocbot.qc
Log:
Don't pre-turn if the next goal is a teleporter / jump pad
Minor change in navigation_routetogoal


Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2009-04-27 18:03:00 UTC (rev 6598)
+++ trunk/data/qcsrc/server/bots.qc	2009-04-27 23:56:59 UTC (rev 6599)
@@ -1634,7 +1634,7 @@
 			break;
 	}
 
-	return TRUE;
+	return FALSE;
 };
 
 void navigation_routetogoals()

Modified: trunk/data/qcsrc/server/havocbot.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot.qc	2009-04-27 18:03:00 UTC (rev 6598)
+++ trunk/data/qcsrc/server/havocbot.qc	2009-04-27 23:56:59 UTC (rev 6599)
@@ -1090,8 +1090,12 @@
 		aimdistance = vlen(now);
 		//heading = self.velocity;
 		//dprint(self.goalstack01.classname,etos(self.goalstack01),"\n");
-		if(self.goalstack01 != self && self.goalstack01 != world && self.aistatus & AI_STATUS_RUNNING == 0)
+		if(
+			self.goalstack01 != self && self.goalstack01 != world && self.aistatus & AI_STATUS_RUNNING == 0 &&
+			!(self.goalcurrent.wpflags & WAYPOINTFLAG_TELEPORT)
+		)
 			next = self.goalstack01.origin - (self.origin + self.view_ofs);
+
 		skillblend=bound(0,(skill-2.5)*0.5,1); //lower skill player can't preturn
 		distanceblend=bound(0,aimdistance/cvar("bot_ai_keyboard_distance"),1);
 		blend = skillblend * (1-distanceblend);