X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fwaypoints.qc;h=2a557c5f05f2ad6e1aa17a19625b0225244e6e29;hb=f963d587753ce1f8e48c8bf87b0bf860732986be;hp=c1afab673f8d358d35bb04c6c6f97bca4f9c38ee;hpb=5cb9126b0ebd2e7ed0ad3a0222603cb99e7594c5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index c1afab673..2a557c5f0 100644
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -170,7 +170,7 @@ void waypoint_getSymmetricalOrigin_cmd(entity caller, bool save, int arg_idx)
 {
 	vector org = '0 0 0';
 	int ctf_flags = 0;
-	for (int i = 0; i < 6; i++)
+	for (int i = 0; i < 6; ++i)
 	{
 		if (argv(arg_idx + i) != "")
 			ctf_flags++;
@@ -190,7 +190,7 @@ void waypoint_getSymmetricalOrigin_cmd(entity caller, bool save, int arg_idx)
 	else
 	{
 		vector v1, v2, v3, v4, v5, v6;
-		for (int i = 1; i <= ctf_flags; i++)
+		for (int i = 1; i <= ctf_flags; ++i)
 		{
 			if (i == 1) { v1 = stov(argv(arg_idx++)); org = v1 / ctf_flags; }
 			else if (i == 2) { v2 = stov(argv(arg_idx++)); org += v2 / ctf_flags; }
@@ -453,11 +453,7 @@ entity waypoint_spawn(vector m1, vector m2, float f)
 	w.wpflags = f;
 	w.solid = SOLID_TRIGGER;
 	w.createdtime = time;
-	w.origin = (m1 + m2) * 0.5;
-	if (waypointeditor_enabled)
-		setorigin(w, w.origin);
-	else // don't link into the world, only bots are aware of waypoints
-		make_pure(w);
+	setorigin(w, (m1 + m2) * 0.5);
 	setsize(w, m1 - w.origin, m2 - w.origin);
 	if (w.size)
 		w.wpisbox = true;
@@ -651,7 +647,7 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo
 			e = it; break;
 		});
 		if (!e)
-			e = waypoint_spawn(jp.absmin - PL_MAX_CONST + '1 1 1', jp.absmax - PL_MIN_CONST + '-1 -1 -1', WAYPOINTFLAG_TELEPORT);
+			e = waypoint_spawn(jp.absmin - PL_MAX_CONST, jp.absmax - PL_MIN_CONST, WAYPOINTFLAG_TELEPORT);
 		if (!pl.wp_locked)
 			pl.wp_locked = e;
 	}
@@ -1295,10 +1291,7 @@ spawnfunc(waypoint)
 {
 	IL_PUSH(g_waypoints, this);
 
-	if (waypointeditor_enabled)
-		setorigin(this, this.origin);
-	else
-		make_pure(this);
+	setorigin(this, this.origin);
 	// schedule a relink after other waypoints have had a chance to spawn
 	waypoint_clearlinks(this);
 	//waypoint_schedulerelink(this);
@@ -1570,9 +1563,9 @@ void waypoint_load_hardwiredlinks()
 		{
 			waypoint_addlink(wp_from, wp_to);
 			waypoint_mark_hardwiredlink(wp_from, wp_to);
-		} else if (wp_from.wpflags & WPFLAGMASK_NORELINK
-			&& ((wp_from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT))
-				|| (wp_from.wpisbox && wp_from.wpflags & WAYPOINTFLAG_TELEPORT)))
+		}
+		else if ((wp_from.wpflags & WPFLAGMASK_NORELINK) && ((wp_from.wpflags & (WAYPOINTFLAG_JUMP | WAYPOINTFLAG_SUPPORT))
+		|| (wp_from.wpisbox && (wp_from.wpflags & WAYPOINTFLAG_TELEPORT))))
 		{
 			waypoint_addlink(wp_from, wp_to);
 		}
@@ -2069,7 +2062,7 @@ void waypoint_spawnforteleporter_wz(entity e, entity tracetest_ent)
 void waypoint_spawnforteleporter(entity e, vector destination, float timetaken, entity tracetest_ent)
 {
 	destination = waypoint_fixorigin(destination, tracetest_ent);
-	waypoint_spawnforteleporter_boxes(e, WAYPOINTFLAG_TELEPORT, e.absmin - PL_MAX_CONST + '1 1 1', e.absmax - PL_MIN_CONST + '-1 -1 -1', destination, destination, timetaken);
+	waypoint_spawnforteleporter_boxes(e, WAYPOINTFLAG_TELEPORT, e.absmin - PL_MAX_CONST, e.absmax - PL_MIN_CONST, destination, destination, timetaken);
 }
 
 entity waypoint_spawnpersonal(entity this, vector position)