Merge branch 'master' into Lyberta/GamemodesSplit

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

diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc
index 82d82cb590f3835dbc0691ae7b17840176adfd00..48975b8367e58766668e59027e5e73000b9b4d51 100644 (file)
--- a/qcsrc/server/bot/default/scripting.qc
+++ b/qcsrc/server/bot/default/scripting.qc
@@ -620,10 +620,11 @@ float bot_cmd_eval(entity this, string expr)
                return cvar(substring(expr, 5, strlen(expr)));
 
        // Search for fields
+       // TODO: expand with support for more fields (key carrier, ball carrier, armor etc)
        switch(expr)
        {
                case "health":
-                       return this.health;
+                       return GetResourceAmount(this, RESOURCE_HEALTH);
                case "speed":
                        return vlen(this.velocity);
                case "flagcarrier":