X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Faim.qc;h=3dd0b84543b6c83f0cdad70b90ca0a35762a6ce1;hb=2c0e35d3ee9fe6652c9c56f29dbbf546da0043b0;hp=cb42aa5c2c4b0b158697b4122a51c27e88543d7d;hpb=b58d514c07e4b22b86a93977653787902efba1d6;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/bot/aim.qc b/qcsrc/server/bot/aim.qc index cb42aa5c2..3dd0b8454 100644 --- a/qcsrc/server/bot/aim.qc +++ b/qcsrc/server/bot/aim.qc @@ -111,7 +111,7 @@ float bot_shouldattack(entity e) return FALSE; } - if(e.freezetag_frozen) + if(e.frozen) return FALSE; // If neither player has ball then don't attack unless the ball is on the @@ -126,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) @@ -135,11 +135,13 @@ float bot_shouldattack(entity e) return FALSE; if (e.BUTTON_CHAT) return FALSE; - if(g_minstagib) - if(e.items & IT_STRENGTH) - return FALSE; if(e.flags & FL_NOTARGET) return FALSE; + + checkentity = e; + if(MUTATOR_CALLHOOK(BotShouldAttack)) + return FALSE; + return TRUE; }