X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fnavigation.qh;h=233ae9ae77459c4f144921e65b7a56f890199102;hp=35036798498178f4e813f1584a1746a8d1195856;hb=4096ab0591cbd7fac803e022375cd3c221511d8b;hpb=991afcbcdeaf904cd052ad7399d00d0ec6e619f8

diff --git a/qcsrc/server/bot/default/navigation.qh b/qcsrc/server/bot/default/navigation.qh
index 350367984..233ae9ae7 100644
--- a/qcsrc/server/bot/default/navigation.qh
+++ b/qcsrc/server/bot/default/navigation.qh
@@ -30,6 +30,7 @@ entity navigation_bestgoal;
 .float goalcurrent_distance_time;
 
 .float goalentity_lock_timeout;
+.bool goalentity_shouldbefrozen;
 
 .entity nearestwaypoint;
 .float nearestwaypointtimeout;
@@ -50,59 +51,18 @@ entity navigation_bestgoal;
 #define navigation_item_addlink(from_wp, to_item) \
 	waypoint_addlink_customcost(to_item, from_wp, waypoint_getlinkcost(from_wp, to_item))
 
-// if ent is a box waypoint or an item v is set to coords of ent that are closer to org
-#define SET_DESTCOORDS(ent, org, v) MACRO_BEGIN { \
-	if ((ent.classname != "waypoint") || ent.wpisbox) { \
-		vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1); \
-		vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1); \
-		v.x = bound(wm1.x, org.x, wm2.x); \
-		v.y = bound(wm1.y, org.y, wm2.y); \
-		v.z = bound(wm1.z, org.z, wm2.z); \
-	} else { \
-		v = ent.origin; \
-	} \
-} MACRO_END
-
-// if ent is a box waypoint or an item v is set to coords of ent that are closer to org
-// (but v.z is set to the lowest coord of ent), v_height is set to ent's height
-#define SET_TRACEWALK_DESTCOORDS(ent, org, v, v_height) MACRO_BEGIN { \
-	if ((ent.classname != "waypoint") || ent.wpisbox) { \
-		vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1); \
-		vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1); \
-		v.x = bound(wm1.x, org.x, wm2.x); \
-		v.y = bound(wm1.y, org.y, wm2.y); \
-		v.z = wm1.z; \
-		v_height = wm2.z - wm1.z; \
-	} else { \
-		v = ent.origin; \
-		v_height = 0; \
-	} \
-} MACRO_END
-
-// if ent is a box waypoint or an item v and v2 are set to coords of ent that are closer to org
-// (but v2.z is set to the lowest coord of ent), v2_height is set to ent's height
-#define SET_TRACEWALK_DESTCOORDS_2(ent, org, v, v2, v2_height) MACRO_BEGIN { \
-	if ((ent.classname != "waypoint") || ent.wpisbox) { \
-		vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1); \
-		vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1); \
-		v.x = bound(wm1.x, org.x, wm2.x); \
-		v.y = bound(wm1.y, org.y, wm2.y); \
-		v.z = bound(wm1.z, org.z, wm2.z); \
-		v2.x = v.x; \
-		v2.y = v.y; \
-		v2.z = wm1.z; \
-		v2_height = wm2.z - wm1.z; \
-	} else { \
-		v = ent.origin; \
-		v2 = v; \
-		v2_height = 0; \
-	} \
-} MACRO_END
+#define TELEPORT_USED(pl, tele_wp) \
+	(time - pl.lastteleporttime < ((tele_wp.wpflags & WAYPOINTFLAG_PERSONAL) ? 2 : 0.15) \
+	&& boxesoverlap(tele_wp.absmin, tele_wp.absmax, pl.lastteleport_origin + STAT(PL_MIN, pl), pl.lastteleport_origin + STAT(PL_MAX, pl)))
+
+vector tracewalk_dest;
+float tracewalk_dest_height;
 
 .entity wp_goal_prev0;
 .entity wp_goal_prev1;
 
 .float lastteleporttime;
+.vector lastteleport_origin;
 
 .float blacklisted;
 
@@ -155,6 +115,7 @@ void navigation_markroutes_checkwaypoint(entity w, entity wp, float cost2, vecto
 void navigation_markroutes(entity this, entity fixed_source_waypoint);
 void navigation_markroutes_inverted(entity fixed_source_waypoint);
 void navigation_routerating(entity this, entity e, float f, float rangebias);
+bool navigation_shortenpath(entity this);
 int navigation_poptouchedgoals(entity this);
 void navigation_goalrating_start(entity this);
 void navigation_goalrating_end(entity this);