X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fwaypoints.qc;h=9d78cedc5bbcdaa814a17d8da2837236dc40e45c;hb=ae451c4613d70de122929142380b47a3dcf54280;hp=870a558c579d3b270f8f160376fbcecb084d7db6;hpb=22c9ec191659865b01087057878ca561e4cbbcec;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/waypoints.qc b/qcsrc/server/bot/waypoints.qc
index 870a558c5..9d78cedc5 100644
--- a/qcsrc/server/bot/waypoints.qc
+++ b/qcsrc/server/bot/waypoints.qc
@@ -22,7 +22,7 @@ entity waypoint_spawn(vector m1, vector m2, float f)
 	setorigin(w, (m1 + m2) * 0.5);
 	setsize(w, m1 - w.origin, m2 - w.origin);
 	if (vlen(w.size) > 0)
-		w.wpisbox = TRUE;
+		w.wpisbox = true;
 
 	if(!w.wpisbox)
 	{
@@ -177,17 +177,17 @@ void waypoint_think()
 				continue;
 			}
 			sv = e.origin;
-			sv_x = bound(sm1_x, sv_x, sm2_x);
-			sv_y = bound(sm1_y, sv_y, sm2_y);
-			sv_z = bound(sm1_z, sv_z, sm2_z);
+			sv.x = bound(sm1_x, sv.x, sm2_x);
+			sv.y = bound(sm1_y, sv.y, sm2_y);
+			sv.z = bound(sm1_z, sv.z, sm2_z);
 			ev = self.origin;
 			em1 = e.origin + e.mins;
 			em2 = e.origin + e.maxs;
-			ev_x = bound(em1_x, ev_x, em2_x);
-			ev_y = bound(em1_y, ev_y, em2_y);
-			ev_z = bound(em1_z, ev_z, em2_z);
+			ev.x = bound(em1_x, ev.x, em2_x);
+			ev.y = bound(em1_y, ev.y, em2_y);
+			ev.z = bound(em1_z, ev.z, em2_z);
 			dv = ev - sv;
-			dv_z = 0;
+			dv.z = 0;
 			if (vlen(dv) >= 1050) // max search distance in XY
 			{
 				++relink_lengthculled;
@@ -196,7 +196,7 @@ void waypoint_think()
 			navigation_testtracewalk = 0;
 			if (!self.wpisbox)
 			{
-				tracebox(sv - PL_MIN_z * '0 0 1', PL_MIN, PL_MAX, sv, FALSE, self);
+				tracebox(sv - PL_MIN_z * '0 0 1', PL_MIN, PL_MAX, sv, false, self);
 				if (!trace_startsolid)
 				{
 					//dprint("sv deviation", vtos(trace_endpos - sv), "\n");
@@ -205,14 +205,14 @@ void waypoint_think()
 			}
 			if (!e.wpisbox)
 			{
-				tracebox(ev - PL_MIN_z * '0 0 1', PL_MIN, PL_MAX, ev, FALSE, e);
+				tracebox(ev - PL_MIN_z * '0 0 1', PL_MIN, PL_MAX, ev, false, e);
 				if (!trace_startsolid)
 				{
 					//dprint("ev deviation", vtos(trace_endpos - ev), "\n");
 					ev = trace_endpos + '0 0 1';
 				}
 			}
-			//traceline(self.origin, e.origin, FALSE, world);
+			//traceline(self.origin, e.origin, false, world);
 			//if (trace_fraction == 1)
 			if (!self.wpisbox && tracewalk(self, sv, PL_MIN, PL_MAX, ev, MOVE_NOMONSTERS))
 				waypoint_addlink(self, e);
@@ -225,7 +225,7 @@ void waypoint_think()
 		}
 	}
 	navigation_testtracewalk = 0;
-	self.wplinked = TRUE;
+	self.wplinked = true;
 }
 
 void waypoint_clearlinks(entity wp)
@@ -243,7 +243,7 @@ void waypoint_clearlinks(entity wp)
 	wp.wp16mincost = wp.wp17mincost = wp.wp18mincost = wp.wp19mincost = wp.wp20mincost = wp.wp21mincost = wp.wp22mincost = wp.wp23mincost = f;
 	wp.wp24mincost = wp.wp25mincost = wp.wp26mincost = wp.wp27mincost = wp.wp28mincost = wp.wp29mincost = wp.wp30mincost = wp.wp31mincost = f;
 
-	wp.wplinked = FALSE;
+	wp.wplinked = false;
 }
 
 // tell a spawnfunc_waypoint to relink
@@ -372,7 +372,7 @@ float waypoint_load_links()
 		dprint("waypoint links load from ");
 		dprint(filename);
 		dprint(" failed\n");
-		return FALSE;
+		return false;
 	}
 
 	while ((s = fgets(file)))
@@ -383,7 +383,7 @@ float waypoint_load_links()
 		{
 			// bad file format
 			fclose(file);
-			return FALSE;
+			return false;
 		}
 
 		wp_from_pos	= stov(argv(0));
@@ -393,13 +393,13 @@ float waypoint_load_links()
 		if(!wp_from || wp_from.origin!=wp_from_pos)
 		{
 			wp_from = findradius(wp_from_pos, 1);
-			found = FALSE;
+			found = false;
 			while(wp_from)
 			{
 				if(vlen(wp_from.origin-wp_from_pos)<1)
 				if(wp_from.classname == "waypoint")
 				{
-					found = TRUE;
+					found = true;
 					break;
 				}
 				wp_from = wp_from.chain;
@@ -415,13 +415,13 @@ float waypoint_load_links()
 
 		// Search "to" waypoint
 		wp_to = findradius(wp_to_pos, 1);
-		found = FALSE;
+		found = false;
 		while(wp_to)
 		{
 			if(vlen(wp_to.origin-wp_to_pos)<1)
 			if(wp_to.classname == "waypoint")
 			{
-				found = TRUE;
+				found = true;
 				break;
 			}
 			wp_to = wp_to.chain;
@@ -445,8 +445,8 @@ float waypoint_load_links()
 	dprint(mapname);
 	dprint(".waypoints.cache\n");
 
-	botframe_cachedwaypointlinks = TRUE;
-	return TRUE;
+	botframe_cachedwaypointlinks = true;
+	return true;
 }
 
 void waypoint_load_links_hardwired()
@@ -459,7 +459,7 @@ void waypoint_load_links_hardwired()
 	filename = strcat(filename, ".waypoints.hardwired");
 	file = fopen(filename, FILE_READ);
 
-	botframe_loadedforcedlinks = TRUE;
+	botframe_loadedforcedlinks = true;
 
 	if (file < 0)
 	{
@@ -489,13 +489,13 @@ void waypoint_load_links_hardwired()
 		if(!wp_from || wp_from.origin!=wp_from_pos)
 		{
 			wp_from = findradius(wp_from_pos, 5);
-			found = FALSE;
+			found = false;
 			while(wp_from)
 			{
 				if(vlen(wp_from.origin-wp_from_pos)<5)
 				if(wp_from.classname == "waypoint")
 				{
-					found = TRUE;
+					found = true;
 					break;
 				}
 				wp_from = wp_from.chain;
@@ -510,13 +510,13 @@ void waypoint_load_links_hardwired()
 
 		// Search "to" waypoint
 		wp_to = findradius(wp_to_pos, 5);
-		found = FALSE;
+		found = false;
 		while(wp_to)
 		{
 			if(vlen(wp_to.origin-wp_to_pos)<5)
 			if(wp_to.classname == "waypoint")
 			{
-				found = TRUE;
+				found = true;
 				break;
 			}
 			wp_to = wp_to.chain;
@@ -530,8 +530,8 @@ void waypoint_load_links_hardwired()
 
 		++c;
 		waypoint_addlink(wp_from, wp_to);
-		wp_from.wphardwired = TRUE;
-		wp_to.wphardwired = TRUE;
+		wp_from.wphardwired = true;
+		wp_to.wphardwired = true;
 	}
 
 	fclose(file);
@@ -616,7 +616,7 @@ void waypoint_save_links()
 		w = w.chain;
 	}
 	fclose(file);
-	botframe_cachedwaypointlinks = TRUE;
+	botframe_cachedwaypointlinks = true;
 
 	print("saved ");
 	print(ftos(c));
@@ -666,7 +666,7 @@ void waypoint_saveall()
 		bprint(" failed\n");
 	}
 	waypoint_save_links();
-	botframe_loadedforcedlinks = FALSE;
+	botframe_loadedforcedlinks = false;
 }
 
 // load waypoints from file
@@ -826,10 +826,10 @@ void botframe_showwaypointlinks()
 		if (!player.isbot)
 		if (player.flags & FL_ONGROUND || player.waterlevel > WATERLEVEL_NONE)
 		{
-			//navigation_testtracewalk = TRUE;
-			head = navigation_findnearestwaypoint(player, FALSE);
+			//navigation_testtracewalk = true;
+			head = navigation_findnearestwaypoint(player, false);
 		//	print("currently selected WP is ", etos(head), "\n");
-			//navigation_testtracewalk = FALSE;
+			//navigation_testtracewalk = false;
 			if (head)
 			{
 				w = head     ;if (w) te_lightning2(world, w.origin, player.origin);
@@ -893,7 +893,7 @@ float botframe_autowaypoints_createwp(vector v, entity p, .entity fld, float f)
 		w = find(w, classname, "waypoint");
 	}
 
-	waypoint_schedulerelink(p.fld = waypoint_spawn(v, v, f));
+	waypoint_schedulerelink(p.(fld) = waypoint_spawn(v, v, f));
 	return 1;
 }
 
@@ -948,14 +948,14 @@ float botframe_autowaypoints_fix_from(entity p, float walkfromwp, entity wp, .en
 						if(navigation_waypoint_will_link(w.origin, porg, p, walkfromwp, 1050))
 						{
 							bestdist = d;
-							p.fld = w;
+							p.(fld) = w;
 						}
 			}
 			w = find(w, classname, "waypoint");
 		}
 		if(bestdist < maxdist)
 		{
-			print("update chain to new nearest WP ", etos(p.fld), "\n");
+			print("update chain to new nearest WP ", etos(p.(fld)), "\n");
 			return 0;
 		}
 
@@ -964,7 +964,7 @@ float botframe_autowaypoints_fix_from(entity p, float walkfromwp, entity wp, .en
 			// we know maxdist < 2100
 			// so wp -> porg is still valid
 			// all is good
-			p.fld = wp;
+			p.(fld) = wp;
 			return 0;
 		}
 
@@ -978,14 +978,14 @@ float botframe_autowaypoints_fix_from(entity p, float walkfromwp, entity wp, .en
 		setorigin(p, save);
 		if(w)
 		{
-			p.fld = w;
+			p.(fld) = w;
 			return 0;
 		}
 	}
 
 	tmin = 0;
 	tmax = 1;
-	for(;;)
+	for (;;)
 	{
 		if(tmax - tmin < 0.001)
 		{
@@ -1043,8 +1043,7 @@ float botframe_autowaypoints_fix_from(entity p, float walkfromwp, entity wp, .en
 .entity botframe_autowaypoints_lastwp0, botframe_autowaypoints_lastwp1;
 void botframe_autowaypoints_fix(entity p, float walkfromwp, .entity fld)
 {
-	float r;
-	r = botframe_autowaypoints_fix_from(p, walkfromwp, p.fld, fld);
+	float r = botframe_autowaypoints_fix_from(p, walkfromwp, p.(fld), fld);
 	if(r != -1)
 		return;
 	r = botframe_autowaypoints_fix_from(p, walkfromwp, world, fld);
@@ -1061,12 +1060,12 @@ void botframe_deleteuselesswaypoints()
 {
 	entity w, w1, w2;
 	float i, j, k;
-	for (w = world; (w = findfloat(w, bot_pickup, TRUE)); )
+	for (w = world; (w = findfloat(w, bot_pickup, true)); )
 	{
 		// NOTE: this protects waypoints if they're the ONLY nearest
 		// waypoint. That's the intention.
-		navigation_findnearestwaypoint(w, FALSE);  // Walk TO item.
-		navigation_findnearestwaypoint(w, TRUE);  // Walk FROM item.
+		navigation_findnearestwaypoint(w, false);  // Walk TO item.
+		navigation_findnearestwaypoint(w, true);  // Walk FROM item.
 	}
 	for (w = world; (w = find(w, classname, "waypoint")); )
 	{
@@ -1147,8 +1146,8 @@ void botframe_autowaypoints()
 		if(p.deadflag)
 			continue;
 		// going back is broken, so only fix waypoints to walk TO the player
-		//botframe_autowaypoints_fix(p, FALSE, botframe_autowaypoints_lastwp0);
-		botframe_autowaypoints_fix(p, TRUE, botframe_autowaypoints_lastwp1);
+		//botframe_autowaypoints_fix(p, false, botframe_autowaypoints_lastwp0);
+		botframe_autowaypoints_fix(p, true, botframe_autowaypoints_lastwp1);
 		//te_explosion(p.botframe_autowaypoints_lastwp0.origin);
 	}