Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/bot/aim.qc b/qcsrc/server/bot/aim.qc
index a2b6e1857ebd80270870369919357d59a1f81adc..3dd0b84543b6c83f0cdad70b90ca0a35762a6ce1 100644 (file)
--- a/qcsrc/server/bot/aim.qc
+++ b/qcsrc/server/bot/aim.qc
@@ -111,9 +111,8 @@ float bot_shouldattack(entity e)
                        return FALSE;
        }
 
-       if(g_freezetag)
-               if(e.freezetag_frozen)
-                       return FALSE;
+       if(e.frozen)
+               return FALSE;
 
        // If neither player has ball then don't attack unless the ball is on the
        // ground.
@@ -127,7 +126,7 @@ float bot_shouldattack(entity e)
                        return FALSE;
        }
        else if(bot_ignore_bots)
-               if(clienttype(e) == CLIENTTYPE_BOT)
+               if(IS_BOT_CLIENT(e))
                        return FALSE;
 
        if (!e.takedamage)