Very minor cleanups

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

diff --git a/qcsrc/server/bot/default/bot.qh b/qcsrc/server/bot/default/bot.qh
index b72fad9bd600248601794130a2cf0f505c110991..98b2ae3df78fb4d970ffd60528d65339b834f687 100644 (file)
--- a/qcsrc/server/bot/default/bot.qh
+++ b/qcsrc/server/bot/default/bot.qh
@@ -16,7 +16,7 @@ const int AI_STATUS_JETPACK_FLYING             = BIT(9);
 const int AI_STATUS_JETPACK_LANDING            = BIT(10);
 const int AI_STATUS_STUCK                      = BIT(11); // Cannot reach any goal
 
-.float isbot; // true if this client is actually a bot
+.bool isbot; // true if this client is actually a bot
 .int aistatus;
 
 // Skill system
@@ -76,14 +76,19 @@ float botframe_spawnedwaypoints;
 float botframe_nextthink;
 float botframe_nextdangertime;
 float bot_cvar_nextthink;
-float bot_ignore_bots; // let bots not attack other bots (only works in non-teamplay)
+
+int _content_type;
+#define IN_LAVA(pos) (_content_type = pointcontents(pos), (_content_type == CONTENT_LAVA || _content_type == CONTENT_SLIME))
+#define IN_LIQUID(pos) (_content_type = pointcontents(pos), (_content_type == CONTENT_WATER || _content_type == CONTENT_LAVA || _content_type == CONTENT_SLIME))
+#define SUBMERGED(pos) IN_LIQUID(pos + autocvar_sv_player_viewoffset)
+#define WETFEET(pos) IN_LIQUID(pos + eZ * (m1.z + 1))
 
 /*
  * Functions
  */
 
 entity bot_spawn();
-float bot_fixcount();
+bool bot_fixcount();
 
 void bot_think(entity this);
 void bot_setnameandstuff(entity this);