Merge branch 'TimePath/issues/1421' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / navigation.qh

diff --git a/qcsrc/server/bot/navigation.qh b/qcsrc/server/bot/navigation.qh
index 6355ef70056f0b8c74d9ddd0787e4782dba72f7c..24d01c7c44f9adfee93013c0ca34fd3e496f61c5 100644 (file)
--- a/qcsrc/server/bot/navigation.qh
+++ b/qcsrc/server/bot/navigation.qh
@@ -6,6 +6,7 @@ float navigation_bestrating;
 float bot_navigation_movemode;
 float navigation_testtracewalk;
 
+vector jumpstepheightvec;
 vector stepheightvec;
 
 entity botframe_dangerwaypoint;
@@ -27,19 +28,21 @@ entity navigation_bestgoal;
 .float navigation_hasgoals;
 .float lastteleporttime;
 
+.float blacklisted;
+
 .entity navigation_jetpack_goal;
 .vector navigation_jetpack_point;
 
-float DEBUG_NODE_SUCCESS        = 1;
-float DEBUG_NODE_WARNING        = 2;
-float DEBUG_NODE_FAIL           = 3;
+const float DEBUG_NODE_SUCCESS        = 1;
+const float DEBUG_NODE_WARNING        = 2;
+const float DEBUG_NODE_FAIL           = 3;
 vector debuglastnode;
 
-entity navigation_wander_owner;        // Owner of the temporary list of goals
-entity navigation_wander_goal;         // Head of the temporary list of goals
-.entity navigation_wander_nextgoal;
-entity navigation_wander_bestgoal;
-float navigation_wander_bestgoalrating;
+entity bot_waypoint_queue_owner;       // Owner of the temporary list of goals
+entity bot_waypoint_queue_goal;                // Head of the temporary list of goals
+.entity bot_waypoint_queue_nextgoal;
+entity bot_waypoint_queue_bestgoal;
+float bot_waypoint_queue_bestgoalrating;
 
 /*
  * Functions