X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fbot%2Fnavigation.qc;h=691ce3e0a929ab44e3b0138c1a91a2fa760b82b0;hb=387861a0bee1121b0869bfaf8cff5b703ffc1ad2;hp=bf963bc7cd703be9d53cacf49c422d0f84c726bd;hpb=ca387f77b7b8044475a7c359e22d2e6d4ebf513d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc
index bf963bc7c..691ce3e0a 100644
--- a/qcsrc/server/bot/navigation.qc
+++ b/qcsrc/server/bot/navigation.qc
@@ -1,3 +1,11 @@
+void bot_debug(string input)
+{
+	switch(autocvar_bot_debug)
+	{
+		case 1: dprint(input); break;
+		case 2: print(input); break;
+	}
+}
 
 // rough simulation of walking from one point to another to test if a path
 // can be traveled, used for waypoint linking and havocbot
@@ -27,6 +35,7 @@ float tracewalk(entity e, vector start, vector m1, vector m2, vector end, float
 	dir = normalize(move);
 	stepdist = 32;
 	ignorehazards = FALSE;
+	swimming = FALSE;
 
 	// Analyze starting point
 	traceline(start, start, MOVE_NORMAL, e);
@@ -108,7 +117,7 @@ float tracewalk(entity e, vector start, vector m1, vector m2, vector end, float
 							break;
 				}
 
-				if not (pointcontents(org + '0 0 1') == CONTENT_EMPTY)
+				if (!(pointcontents(org + '0 0 1') == CONTENT_EMPTY))
 				{
 					if(autocvar_bot_debug_tracewalk)
 						debugnodestatus(org, DEBUG_NODE_FAIL);
@@ -187,7 +196,7 @@ float tracewalk(entity e, vector start, vector m1, vector m2, vector end, float
 			{
 				float c;
 				c = pointcontents(org + '0 0 1');
-				if not(c == CONTENT_WATER || c == CONTENT_LAVA || c == CONTENT_SLIME)
+				if (!(c == CONTENT_WATER || c == CONTENT_LAVA || c == CONTENT_SLIME))
 					swimming = FALSE;
 				else
 					continue;
@@ -673,7 +682,7 @@ void navigation_routerating(entity e, float f, float rangebias)
 	{
 		vector pointa, pointb;
 
-	//	dprint("jetpack ai: evaluating path for ", e.classname,"\n");
+		bot_debug(strcat("jetpack ai: evaluating path for ", e.classname, "\n"));
 
 		// Point A
 		traceline(self.origin, self.origin + '0 0 65535', MOVE_NORMAL, self);
@@ -688,7 +697,7 @@ void navigation_routerating(entity e, float f, float rangebias)
 
 		if(trace_fraction==1)
 		{
-		//	dprint("jetpack ai: can bridge these two points\n");
+			bot_debug("jetpack ai: can bridge these two points\n");
 
 			// Lower the altitude of these points as much as possible
 			float zdistance, xydistance, cost, t, fuel;
@@ -725,7 +734,7 @@ void navigation_routerating(entity e, float f, float rangebias)
 			t += xydistance / autocvar_g_jetpack_maxspeed_side;
 			fuel = t * autocvar_g_jetpack_fuel * 0.8;
 
-		//	dprint("jetpack ai: required fuel ", ftos(fuel), " self.ammo_fuel ", ftos(self.ammo_fuel),"\n");
+			bot_debug(strcat("jetpack ai: required fuel ", ftos(fuel), " self.ammo_fuel ", ftos(self.ammo_fuel), "\n"));
 
 			// enough fuel ?
 			if(self.ammo_fuel>fuel)
@@ -743,7 +752,7 @@ void navigation_routerating(entity e, float f, float rangebias)
 
 				if (navigation_bestrating < f)
 				{
-			//		dprint("jetpack path: added goal", e.classname, " (with rating ", ftos(f), ")\n");
+					bot_debug(strcat("jetpack path: added goal ", e.classname, " (with rating ", ftos(f), ")\n"));
 					navigation_bestrating = f;
 					navigation_bestgoal = e;
 					self.navigation_jetpack_goal = e;
@@ -770,7 +779,7 @@ void navigation_routerating(entity e, float f, float rangebias)
 
 		if(e.flags & FL_ITEM)
 		{
-			if not(e.flags & FL_WEAPON)
+			if (!(e.flags & FL_WEAPON))
 			if(e.nearestwaypoint)
 				search = FALSE;
 		}
@@ -789,7 +798,7 @@ void navigation_routerating(entity e, float f, float rangebias)
 				e.nearestwaypoint = nwp;
 			else
 			{
-				dprint("FAILED to find a nearest waypoint to '", e.classname, "' #", etos(e), "\n");
+				bot_debug(strcat("FAILED to find a nearest waypoint to '", e.classname, "' #", etos(e), "\n"));
 
 				if(e.flags & FL_ITEM)
 					e.blacklisted = TRUE;
@@ -801,7 +810,7 @@ void navigation_routerating(entity e, float f, float rangebias)
 
 				if(e.blacklisted)
 				{
-					dprint("The entity '", e.classname, "' is going to be excluded from path finding during this match\n");
+					bot_debug(strcat("The entity '", e.classname, "' is going to be excluded from path finding during this match\n"));
 					return;
 				}
 			}
@@ -815,23 +824,21 @@ void navigation_routerating(entity e, float f, float rangebias)
 		nwp = e.nearestwaypoint;
 	}
 
-	//dprint("-- checking ", e.classname, " (with cost ", ftos(nwp.wpcost), ")\n");
+	bot_debug(strcat("-- checking ", e.classname, " (with cost ", ftos(nwp.wpcost), ")\n"));
 	if (nwp)
 	if (nwp.wpcost < 10000000)
 	{
 		//te_wizspike(nwp.wpnearestpoint);
-	//	dprint(e.classname, " ", ftos(f), "/(1+", ftos((nwp.wpcost + vlen(e.origin - nwp.wpnearestpoint))), "/", ftos(rangebias), ") = ");
+		bot_debug(strcat(e.classname, " ", ftos(f), "/(1+", ftos((nwp.wpcost + vlen(e.origin - nwp.wpnearestpoint))), "/", ftos(rangebias), ") = "));
 		f = f * rangebias / (rangebias + (nwp.wpcost + vlen(o - nwp.wpnearestpoint)));
-		//dprint("considering ", e.classname, " (with rating ", ftos(f), ")\n");
-		//dprint(ftos(f));
+		bot_debug(strcat("considering ", e.classname, " (with rating ", ftos(f), ")\n"));
 		if (navigation_bestrating < f)
 		{
-		//	dprint("ground path: added goal ", e.classname, " (with rating ", ftos(f), ")\n");
+			bot_debug(strcat("ground path: added goal ", e.classname, " (with rating ", ftos(f), ")\n"));
 			navigation_bestrating = f;
 			navigation_bestgoal = e;
 		}
 	}
-	//dprint("\n");
 }
 
 // adds an item to the the goal stack with the path to a given item
@@ -896,7 +903,7 @@ void navigation_poptouchedgoals()
 			if(self.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
 			if(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL && self.goalcurrent.owner==self)
 			{
-				self.aistatus &~= AI_STATUS_WAYPOINT_PERSONAL_GOING;
+				self.aistatus &= ~AI_STATUS_WAYPOINT_PERSONAL_GOING;
 				self.aistatus |= AI_STATUS_WAYPOINT_PERSONAL_REACHED;
 			}
 			navigation_poproute();
@@ -910,7 +917,7 @@ void navigation_poptouchedgoals()
 	if(checkpvs(self.origin + self.view_ofs, self.goalstack01))
 	if(tracewalk(self, self.origin, self.mins, self.maxs, (self.goalstack01.absmin + self.goalstack01.absmax) * 0.5, bot_navigation_movemode))
 	{
-	///	dprint("path optimized for ", self.netname, ", removed a goal from the queue\n");
+		bot_debug(strcat("path optimized for ", self.netname, ", removed a goal from the queue\n"));
 		navigation_poproute();
 		// TODO this may also be a nice idea to do "early" (e.g. by
 		// manipulating the vlen() comparisons) to shorten paths in
@@ -922,7 +929,7 @@ void navigation_poptouchedgoals()
 
 	// HACK: remove players/bots as goals, they can lead a bot to unexpected places (cliffs, lava, etc)
 	// TODO: rate waypoints near the targetted player at that moment, instead of the player itself
-	if(self.goalcurrent.classname=="player")
+	if(IS_PLAYER(self.goalcurrent))
 		navigation_poproute();
 
 	// aid for detecting jump pads better (distance based check fails sometimes)
@@ -943,7 +950,7 @@ void navigation_poptouchedgoals()
 				if(self.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
 				if(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL && self.goalcurrent.owner==self)
 				{
-					self.aistatus &~= AI_STATUS_WAYPOINT_PERSONAL_GOING;
+					self.aistatus &= ~AI_STATUS_WAYPOINT_PERSONAL_GOING;
 					self.aistatus |= AI_STATUS_WAYPOINT_PERSONAL_REACHED;
 				}
 
@@ -958,7 +965,7 @@ void navigation_poptouchedgoals()
 		if(self.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
 		if(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL && self.goalcurrent.owner==self)
 		{
-			self.aistatus &~= AI_STATUS_WAYPOINT_PERSONAL_GOING;
+			self.aistatus &= ~AI_STATUS_WAYPOINT_PERSONAL_GOING;
 			self.aistatus |= AI_STATUS_WAYPOINT_PERSONAL_REACHED;
 		}
 
@@ -987,15 +994,15 @@ void navigation_goalrating_end()
 		return;
 
 	navigation_routetogoal(navigation_bestgoal, self.origin);
-//	dprint("best goal ", self.goalcurrent.classname , "\n");
+	bot_debug(strcat("best goal ", self.goalcurrent.classname , "\n"));
 
 	// If the bot got stuck then try to reach the farthest waypoint
-	if not (self.navigation_hasgoals)
+	if (!self.navigation_hasgoals)
 	if (autocvar_bot_wander_enable)
 	{
-		if not(self.aistatus & AI_STATUS_STUCK)
+		if (!(self.aistatus & AI_STATUS_STUCK))
 		{
-			dprint(self.netname, " cannot walk to any goal\n");
+			bot_debug(strcat(self.netname, " cannot walk to any goal\n"));
 			self.aistatus |= AI_STATUS_STUCK;
 		}
 
@@ -1045,12 +1052,12 @@ void navigation_unstuck()
 {
 	float search_radius = 1000;
 
-	if not(autocvar_bot_wander_enable)
+	if (!autocvar_bot_wander_enable)
 		return;
 
-	if not(bot_waypoint_queue_owner)
+	if (!bot_waypoint_queue_owner)
 	{
-	//	dprint(self.netname, " sutck, taking over the waypoints queue\n");
+		bot_debug(strcat(self.netname, " sutck, taking over the waypoints queue\n"));
 		bot_waypoint_queue_owner = self;
 		bot_waypoint_queue_bestgoal = world;
 		bot_waypoint_queue_bestgoalrating = 0;
@@ -1063,7 +1070,7 @@ void navigation_unstuck()
 	{
 		// evaluate the next goal on the queue
 		float d = vlen(self.origin - bot_waypoint_queue_goal.origin);
-		// dprint(self.netname, " evaluating ", bot_waypoint_queue_goal.classname, " with distance ", ftos(d), "\n");
+		bot_debug(strcat(self.netname, " evaluating ", bot_waypoint_queue_goal.classname, " with distance ", ftos(d), "\n"));
 		if(tracewalk(bot_waypoint_queue_goal, self.origin, PL_MIN, PL_MAX, bot_waypoint_queue_goal.origin, bot_navigation_movemode))
 		{
 			if( d > bot_waypoint_queue_bestgoalrating)
@@ -1074,18 +1081,18 @@ void navigation_unstuck()
 		}
 		bot_waypoint_queue_goal = bot_waypoint_queue_goal.bot_waypoint_queue_nextgoal;
 
-		if not(bot_waypoint_queue_goal)
+		if (!bot_waypoint_queue_goal)
 		{
 			if (bot_waypoint_queue_bestgoal)
 			{
-				dprint(self.netname, " stuck, reachable waypoint found, heading to it\n");
+				bot_debug(strcat(self.netname, " stuck, reachable waypoint found, heading to it\n"));
 				navigation_routetogoal(bot_waypoint_queue_bestgoal, self.origin);
 				self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-				self.aistatus &~= AI_STATUS_STUCK;
+				self.aistatus &= ~AI_STATUS_STUCK;
 			}
 			else
 			{
-				dprint(self.netname, " stuck, cannot walk to any waypoint at all\n");
+				bot_debug(strcat(self.netname, " stuck, cannot walk to any waypoint at all\n"));
 			}
 
 			bot_waypoint_queue_owner = world;
@@ -1097,7 +1104,7 @@ void navigation_unstuck()
 			return;
 
 		// build a new queue
-		dprint(self.netname, " stuck, scanning reachable waypoints within ", ftos(search_radius)," qu\n");
+		bot_debug(strcat(self.netname, " stuck, scanning reachable waypoints within ", ftos(search_radius)," qu\n"));
 
 		entity head, first;
 
@@ -1125,7 +1132,7 @@ void navigation_unstuck()
 			bot_waypoint_queue_goal = first;
 		else
 		{
-			dprint(self.netname, " stuck, cannot walk to any waypoint at all\n");
+			bot_debug(strcat(self.netname, " stuck, cannot walk to any waypoint at all\n"));
 			bot_waypoint_queue_owner = world;
 		}
 	}
@@ -1140,7 +1147,7 @@ void debugresetnodes()
 
 void debugnode(vector node)
 {
-	if not(self.classname=="player")
+	if (!IS_PLAYER(self))
 		return;
 
 	if(debuglastnode=='0 0 0')
@@ -1218,6 +1225,7 @@ void debuggoalstack()
 	else if(self.goalcounter==29)goal=self.goalstack29;
 	else if(self.goalcounter==30)goal=self.goalstack30;
 	else if(self.goalcounter==31)goal=self.goalstack31;
+	else goal=world;
 
 	if(goal==world)
 	{