r2075 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-12-29 12:14:06 -0500 (Fri, 29 Dec 2006)
New Revision: 2075

Modified:
   trunk/data/qcsrc/server/bots.qc
Log:
make waypoints go through doors; fix "no waypoints" issue with current DP; new cvar "waypoint_benchmark" exits once waypoints are linked, to measure relinking time


Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2006-12-29 13:45:02 UTC (rev 2074)
+++ trunk/data/qcsrc/server/bots.qc	2006-12-29 17:14:06 UTC (rev 2075)
@@ -93,7 +93,7 @@
 		if (trace_dpstartcontents & DPCONTENTS_LIQUIDSMASK)
 		{
 			move = normalize(end - org);
-			tracebox(org, m1, m2, org + move * stepdist, FALSE, e);
+			tracebox(org, m1, m2, org + move * stepdist, MOVE_WORLDONLY, e);
 			if (trace_fraction < 1)
 			{
 				if (navigation_testtracewalk)
@@ -111,10 +111,10 @@
 		else
 		{
 			move = dir * stepdist + org;
-			tracebox(org, m1, m2, move, FALSE, e);
+			tracebox(org, m1, m2, move, MOVE_WORLDONLY, e);
 			if (trace_fraction < 1)
 			{
-				tracebox(org + stepheightvec, m1, m2, move + stepheightvec, FALSE, e);
+				tracebox(org + stepheightvec, m1, m2, move + stepheightvec, MOVE_WORLDONLY, e);
 				if (trace_fraction < 1 || trace_startsolid)
 				{
 					if (navigation_testtracewalk)
@@ -939,7 +939,7 @@
 	local entity waylist, w, best;
 	local float dist, bestdist;
 	local vector v, org;
-	org = player.origin + (self.mins_z - PL_MIN_z) * '0 0 1';
+	org = player.origin + (player.mins_z - PL_MIN_z) * '0 0 1';
 	if (navigation_testtracewalk)
 		te_plasmaburn(org);
 	best = world;
@@ -2016,6 +2016,12 @@
 	while (currentbots > bots)
 		bot_removenewest();
 
+	if(botframe_spawnedwaypoints)
+	{
+		if(cvar("waypoint_benchmark"))
+			localcmd("quit\n");
+	}
+
 	if (bots > 0 || cvar("g_waypointeditor"))
 	if (!botframe_spawnedwaypoints)
 	{