Merge branch 'master' into terencehill/bot_ai

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

diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qh b/qcsrc/server/bot/default/havocbot/havocbot.qh
index 2d3d3291320201437aa034ee666420ce0807fe0d..2f987f674ec8719503137e05452abe5e7701fd1e 100644 (file)
--- a/qcsrc/server/bot/default/havocbot/havocbot.qh
+++ b/qcsrc/server/bot/default/havocbot/havocbot.qh
@@ -1,12 +1,11 @@
-#ifndef HAVOCBOT_H
-#define HAVOCBOT_H
+#pragma once
 
 /*
  * Globals and Fields
  */
 
 .float havocbot_keyboardskill;
-.float facingwalltime, ignoregoaltime;
+.float ignoregoaltime;
 .float lastfiredweapon;
 .float lastcombotime;
 .float havocbot_blockhead;
@@ -24,6 +23,7 @@
 .float havocbot_stickenemy;
 .float havocbot_role_timeout;
 
+.float bot_tracewalk_time;
 .entity ignoregoal;
 .entity bot_lastseengoal;
 .entity havocbot_personal_waypoint;
@@ -34,27 +34,27 @@
  * Functions
  */
 
-void havocbot_ai();
-void havocbot_aim();
-void havocbot_setupbot();
-void havocbot_movetogoal();
-void havocbot_chooserole();
-void havocbot_chooseenemy();
-void havocbot_chooseweapon();
-void havocbot_bunnyhop(vector dir);
-void havocbot_keyboard_movement(vector destorg);
+void havocbot_ai(entity this);
+void havocbot_aim(entity this);
+void havocbot_setupbot(entity this);
+void havocbot_movetogoal(entity this);
+void havocbot_chooserole(entity this);
+void havocbot_chooseenemy(entity this);
+void havocbot_chooseweapon(entity this, .entity weaponentity);
+void havocbot_bunnyhop(entity this, vector dir);
+void havocbot_keyboard_movement(entity this, vector destorg);
 
-float havocbot_resetgoal();
-float havocbot_moveto(vector pos);
-float havocbot_moveto_refresh_route();
+float havocbot_resetgoal(entity this);
+float havocbot_moveto(entity this, vector pos);
+float havocbot_moveto_refresh_route(entity this);
 
-vector havocbot_dodge();
+vector havocbot_dodge(entity this);
 
-.void() havocbot_role;
-.void() havocbot_previous_role;
+.void(entity this) havocbot_role;
+.void(entity this) havocbot_previous_role;
 
-void(float ratingscale, vector org, float sradius) havocbot_goalrating_items;
-void(float ratingscale, vector org, float sradius) havocbot_goalrating_enemyplayers;
+void(entity this, float ratingscale, vector org, float sradius) havocbot_goalrating_items;
+void(entity this, float ratingscale, vector org, float sradius) havocbot_goalrating_enemyplayers;
 
 /*
  * Imports
@@ -63,4 +63,3 @@ void(float ratingscale, vector org, float sradius) havocbot_goalrating_enemyplay
 .entity draggedby;
 .float ladder_time;
 .entity ladder_entity;
-#endif