Fix waypoints for warpzones with oblique or horizontal warp plane

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / null / bot_null.qc

diff --git a/qcsrc/server/bot/null/bot_null.qc b/qcsrc/server/bot/null/bot_null.qc
index 75a7bcd111df4da17964d4b7376a6402d2048594..f8738f80fb5cdc855eda4bd6bb9ad351ddf9d5cb 100644 (file)
--- a/qcsrc/server/bot/null/bot_null.qc
+++ b/qcsrc/server/bot/null/bot_null.qc
@@ -1,6 +1,7 @@
 #include "bot_null.qh"
 
-bool bot_aim(entity this, float shotspeed, float shotspeedupward, float maxshottime, float applygravity) { return false; }
+#if 0
+bool bot_aim(entity this, .entity weaponentity, float shotspeed, float shotspeedupward, float maxshottime, float applygravity) { return false; }
 void bot_clientconnect(entity this) { }
 void bot_clientdisconnect(entity this) { }
 void bot_cmdhelp(string scmd) { }
@@ -17,7 +18,6 @@ void bot_think(entity this) { }
 entity find_bot_by_name(string name) { return NULL; }
 entity find_bot_by_number(float number) { return NULL; }
 
-void havocbot_goalrating_controlpoints(entity this, float ratingscale, vector org, float sradius) { }
 void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org, float sradius) { }
 void havocbot_goalrating_items(entity this, float ratingscale, vector org, float sradius) { }
 
@@ -28,14 +28,17 @@ 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 tracewalk(entity e, vector start, vector m1, vector m2, vector end, float movemode) { return false; }
+bool tracewalk(entity e, vector start, vector m1, vector m2, vector end, float end_height, float movemode) { return false; }
 
-void waypoint_remove(entity e) { }
+void waypoint_remove_fromeditor(entity pl) { }
+void waypoint_remove(entity wp) { }
 void waypoint_saveall() { }
 void waypoint_schedulerelinkall() { }
 void waypoint_schedulerelink(entity wp) { }
 void waypoint_spawnforitem(entity e) { }
 void waypoint_spawnforitem_force(entity e, vector org) { }
-void waypoint_spawnforteleporter(entity e, vector destination, float timetaken) { }
-void waypoint_spawnforteleporter_v(entity e, vector org, vector destination, float timetaken) { }
+void waypoint_spawnforteleporter(entity e, vector destination, float timetaken, entity tracetest_ent) { }
+void waypoint_spawnforteleporter_wz(entity e, vector org, vector destination, float timetaken, vector down_dir, entity tracetest_ent) { }
+void waypoint_spawn_fromeditor(entity pl) { }
 entity waypoint_spawn(vector m1, vector m2, float f) { return NULL; }
+#endif