Merge remote-tracking branch 'origin/Mario/extralife_fix'

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

diff --git a/qcsrc/server/bot/bot.qh b/qcsrc/server/bot/bot.qh
index 75619e19b786633e198a2063bac65bf0e34655ae..6823841d9bc91aa7d998369782b884d4721f2212 100644 (file)
--- a/qcsrc/server/bot/bot.qh
+++ b/qcsrc/server/bot/bot.qh
@@ -2,17 +2,18 @@
  * Globals and Fields
  */
 
-float AI_STATUS_ROAMING                                = 1;    // Bot is just crawling the map. No enemies at sight
-float AI_STATUS_ATTACKING                      = 2;    // There are enemies at sight
-float AI_STATUS_RUNNING                                = 4;    // Bot is bunny hopping
-float AI_STATUS_DANGER_AHEAD                   = 8;    // There is lava/slime/trigger_hurt ahead
-float AI_STATUS_OUT_JUMPPAD                    = 16;   // Trying to get out of a "vertical" jump pad
-float AI_STATUS_OUT_WATER                      = 32;   // Trying to get out of water
+float AI_STATUS_ROAMING                                                = 1;    // Bot is just crawling the map. No enemies at sight
+float AI_STATUS_ATTACKING                                      = 2;    // There are enemies at sight
+float AI_STATUS_RUNNING                                                = 4;    // Bot is bunny hopping
+float AI_STATUS_DANGER_AHEAD                           = 8;    // There is lava/slime/trigger_hurt ahead
+float AI_STATUS_OUT_JUMPPAD                                    = 16;   // Trying to get out of a "vertical" jump pad
+float AI_STATUS_OUT_WATER                                      = 32;   // Trying to get out of water
 float AI_STATUS_WAYPOINT_PERSONAL_LINKING      = 64;   // Waiting for the personal waypoint to be linked
 float AI_STATUS_WAYPOINT_PERSONAL_GOING                = 128;  // Going to a personal waypoint
 float AI_STATUS_WAYPOINT_PERSONAL_REACHED      = 256;  // Personal waypoint reached
-float AI_STATUS_JETPACK_FLYING                 = 512;
-float AI_STATUS_JETPACK_LANDING                        = 1024;
+float AI_STATUS_JETPACK_FLYING                         = 512;
+float AI_STATUS_JETPACK_LANDING                                = 1024;
+float AI_STATUS_STUCK                                          = 2048; // Cannot reach any goal
 
 .float isbot; // true if this client is actually a bot
 .float aistatus;
@@ -53,6 +54,7 @@ entity bot_list;
 entity player_list;
 .entity nextbot;
 .entity nextplayer;
+.string cleanname;
 .string netname_freeme;
 .string playermodel_freeme;
 .string playerskin_freeme;
@@ -107,10 +109,10 @@ void bot_serverframe();
  * Imports
  */
 
-float sv_maxspeed;
-
 void() havocbot_setupbot;
 
 float c1, c2, c3, c4;
 void CheckAllowedTeams(entity for_whom); void GetTeamCounts(entity other);
 float JoinBestTeam(entity pl, float only_return_best, float forcebestteam);
+
+void bot_calculate_stepheightvec(void);