Revert "Merge branch 'TimePath/bot_api' into 'master'\r"

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / progs.inc

diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc
index ad1e855e50c0a3138b40c70fb6d5c734fd89991a..adb8cf6323d643006c4c832e44ef7886c782b374 100644 (file)
--- a/qcsrc/server/progs.inc
+++ b/qcsrc/server/progs.inc
@@ -7,8 +7,6 @@
 
 #include "../lib/_all.inc"
 
-#include "bot/lib/steerlib/steerlib.qh"
-
 #include "anticheat.qc"
 #include "antilag.qc"
 #include "campaign.qc"
@@ -31,6 +29,7 @@
 #include "item_key.qc"
 #include "mapvoting.qc"
 #include "miscfunctions.qc"
+#include "movelib.qc"
 #include "playerdemo.qc"
 #include "portals.qc"
 #include "race.qc"
@@ -38,21 +37,36 @@
 #include "scores.qc"
 #include "scores_rules.qc"
 #include "spawnpoints.qc"
+#include "steerlib.qc"
 #include "sv_main.qc"
 #include "teamplay.qc"
-
-#include "bot/lib/all.inc"
-
 #include "t_halflife.qc"
 #include "t_items.qc"
 #include "t_quake3.qc"
 #include "t_quake.qc"
 
+#include "bot/aim.qc"
+#include "bot/bot.qc"
+#include "bot/navigation.qc"
+#include "bot/scripting.qc"
+#include "bot/waypoints.qc"
+
+#include "bot/havocbot/havocbot.qc"
+#include "bot/havocbot/role_keyhunt.qc"
+#include "bot/havocbot/roles.qc"
+
 #include "command/all.qc"
 
 #include "mutators/mutators_include.qc"
 #include "mutators/mutators.qc"
 
+#include "pathlib/costs.qc"
+#include "pathlib/expandnode.qc"
+#include "pathlib/main.qc"
+#include "pathlib/movenode.qc"
+#include "pathlib/path_waypoint.qc"
+#include "pathlib/utility.qc"
+
 #include "weapons/accuracy.qc"
 #include "weapons/common.qc"
 #include "weapons/csqcprojectile.qc" // TODO
@@ -106,8 +120,6 @@
 #include "../warpzonelib/server.qc"
 #include "../warpzonelib/util_server.qc"
 
-#include "bot/impl.qc"
-
 #if BUILD_MOD
 #include "../../mod/server/progs.inc"
 #endif