Merge branch 'master' into Mario/wepent_experimental

diff --combined qcsrc/server/bot/api.qh
index 79ba6426efd374e442277347e86b0d2e0028c4f9,dbe3197a7c97c0a6cbbe2e7e108281a4444adb5f..97104ef3765908f46d29ad59368f325e3781d759
--- 1/qcsrc/server/bot/api.qh
--- 2/qcsrc/server/bot/api.qh
+++ b/qcsrc/server/bot/api.qh
@@@ -46,7 -46,7 +46,7 @@@ float skill
  .float wpcost;
  .int wpflags;
  
 -bool bot_aim(entity this, float shotspeed, float shotspeedupward, float maxshottime, float applygravity);
 +bool bot_aim(entity this, .entity weaponentity, float shotspeed, float shotspeedupward, float maxshottime, float applygravity);
  void bot_clientconnect(entity this);
  void bot_clientdisconnect(entity this);
  void bot_cmdhelp(string scmd);
@@@ -85,3 -85,6 +85,6 @@@ void waypoint_spawnforitem_force(entit
  void waypoint_spawnforteleporter(entity e, vector destination, float timetaken);
  void waypoint_spawnforteleporter_v(entity e, vector org, vector destination, float timetaken);
  entity waypoint_spawn(vector m1, vector m2, float f);
+ 
+ .entity goalcurrent;
+ void navigation_clearroute(entity this);