Merge branch 'mand1nga/bot-fix-aiming-origins' into mand1nga/bot-assault

diff --combined qcsrc/server/bot/havocbot/havocbot.qc
index 06e21231039ea3674aec900ad3da2b76f145bb92,377dc2ef97237b60ccdc91ff06c4414f5da03f88..a9aa290baf27288b01d7643f411be16350895109
--- 1/qcsrc/server/bot/havocbot/havocbot.qc
--- 2/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@@ -4,7 -4,6 +4,7 @@@
  #include "role_keyhunt.qc"
  #include "role_freezetag.qc"
  #include "role_keepaway.qc"
 +#include "role_assault.qc"
  #include "roles.qc"
  
  void havocbot_ai()
@@@ -1095,10 -1094,10 +1095,10 @@@ void havocbot_aim(
                enemyvel = self.enemy.velocity;
                if (!self.enemy.waterlevel)
                        enemyvel_z = 0;
-               lag_additem(time + self.ping, 0, 0, self.enemy, self.origin, selfvel, self.enemy.origin, enemyvel);
+               lag_additem(time + self.ping, 0, 0, self.enemy, self.origin, selfvel, (self.enemy.absmin + self.enemy.absmax) * 0.5, enemyvel);
        }
        else
-               lag_additem(time + self.ping, 0, 0, world, self.origin, selfvel, ( ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5 ), '0 0 0');
+               lag_additem(time + self.ping, 0, 0, world, self.origin, selfvel, ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5, '0 0 0');
  };
  
  float havocbot_moveto_refresh_route()