Merge remote branch 'origin/pooga/freezetagbots' after adjusting history

[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 9ef109e2b585e3c76053c7b183fbc49da22543ff..9300ac721d889366a386bc8b0a06fb0656ad1443 100644 (file)
--- a/qcsrc/server/bot/aim.qc
+++ b/qcsrc/server/bot/aim.qc
@@ -104,7 +104,7 @@ float bot_shouldattack(entity e)
        {
                if (e == self)
                        return FALSE;
-               if (teams_matter)
+               if (teamplay)
                if (e.team != 0)
                        return FALSE;
        }
@@ -113,7 +113,7 @@ float bot_shouldattack(entity e)
                if(e.freezetag_frozen)
                        return FALSE;
 
-       if(teams_matter)
+       if(teamplay)
        {
                if(e.team==0)
                        return FALSE;