X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fnavigation.qc;h=0f4c330ed8882b2037a6e99bb5f7652d76a421bb;hb=bdeddd60c54aff077878be8a3457de34b7530cad;hp=5c60050cf1c674fb4f6e8694b346e87d9122857a;hpb=a9fd8f699cad3e52b829a99864db55228354e021;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc
index 5c60050cf..0f4c330ed 100644
--- a/qcsrc/server/bot/navigation.qc
+++ b/qcsrc/server/bot/navigation.qc
@@ -117,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);
@@ -196,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;
@@ -366,7 +366,7 @@ float navigation_waypoint_will_link(vector v, vector org, entity ent, float walk
 }
 
 // find the spawnfunc_waypoint near a dynamic goal such as a dropped weapon
-entity navigation_findnearestwaypoint_withdist(entity ent, float walkfromwp, float bestdist)
+entity navigation_findnearestwaypoint_withdist_except(entity ent, float walkfromwp, float bestdist, entity except)
 {
 	entity waylist, w, best;
 	vector v, org, pm1, pm2;
@@ -380,7 +380,7 @@ entity navigation_findnearestwaypoint_withdist(entity ent, float walkfromwp, flo
 	while (w)
 	{
 		// if object is touching spawnfunc_waypoint
-		if(w != ent)
+		if(w != ent && w != except)
 			if (boxesoverlap(pm1, pm2, w.absmin, w.absmax))
 				return w;
 		w = w.chain;
@@ -426,7 +426,14 @@ entity navigation_findnearestwaypoint_withdist(entity ent, float walkfromwp, flo
 }
 entity navigation_findnearestwaypoint(entity ent, float walkfromwp)
 {
-	return navigation_findnearestwaypoint_withdist(ent, walkfromwp, 1050);
+	entity wp = navigation_findnearestwaypoint_withdist_except(ent, walkfromwp, 1050, world);
+	if (autocvar_g_waypointeditor_auto)
+	{
+		entity wp2 = navigation_findnearestwaypoint_withdist_except(ent, walkfromwp, 1050, wp);
+		if (wp && !wp2)
+			wp.wpflags |= WAYPOINTFLAG_PROTECTED;
+	}
+	return wp;
 }
 
 // finds the waypoints near the bot initiating a navigation query
@@ -733,7 +740,7 @@ void navigation_routerating(entity e, float f, float rangebias)
 			t = zdistance / autocvar_g_jetpack_maxspeed_up;
 			t += xydistance / autocvar_g_jetpack_maxspeed_side;
 			fuel = t * autocvar_g_jetpack_fuel * 0.8;
-			
+
 			bot_debug(strcat("jetpack ai: required fuel ", ftos(fuel), " self.ammo_fuel ", ftos(self.ammo_fuel), "\n"));
 
 			// enough fuel ?
@@ -779,7 +786,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;
 		}
@@ -903,7 +910,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();
@@ -950,7 +957,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;
 				}
 
@@ -965,7 +972,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;
 		}
 
@@ -997,10 +1004,10 @@ void navigation_goalrating_end()
 	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))
 		{
 			bot_debug(strcat(self.netname, " cannot walk to any goal\n"));
 			self.aistatus |= AI_STATUS_STUCK;
@@ -1052,10 +1059,10 @@ 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)
 	{
 		bot_debug(strcat(self.netname, " sutck, taking over the waypoints queue\n"));
 		bot_waypoint_queue_owner = self;
@@ -1081,14 +1088,14 @@ 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)
 			{
 				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
 			{
@@ -1147,7 +1154,7 @@ void debugresetnodes()
 
 void debugnode(vector node)
 {
-	if not(IS_PLAYER(self))
+	if (!IS_PLAYER(self))
 		return;
 
 	if(debuglastnode=='0 0 0')