X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Faim.qc;h=0ae33124717ba894248ec42f55b928117baf8b4c;hb=28931c8069eb1d283f01a26f31ad91d921294d9c;hp=578306c4eb89c49c6e69707f07c6750273965601;hpb=cac08f933d832f4b4b63626ddc8c9366f0a69419;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/bot/aim.qc b/qcsrc/server/bot/aim.qc index 578306c4e..0ae331247 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 @@ -137,11 +137,11 @@ float bot_shouldattack(entity e) return FALSE; if(e.flags & FL_NOTARGET) return FALSE; - + checkentity = e; if(MUTATOR_CALLHOOK(BotShouldAttack)) return FALSE; - + return TRUE; } @@ -339,12 +339,12 @@ float bot_aim(float shotspeed, float shotspeedupward, float maxshottime, float a shotspeedupward *= g_weaponspeedfactor; if (!shotspeed) { - dprint("bot_aim: WARNING: weapon ", W_Name(self.weapon), " shotspeed is zero!\n"); + dprint("bot_aim: WARNING: weapon ", WEP_NAME(self.weapon), " shotspeed is zero!\n"); shotspeed = 1000000; } if (!maxshottime) { - dprint("bot_aim: WARNING: weapon ", W_Name(self.weapon), " maxshottime is zero!\n"); + dprint("bot_aim: WARNING: weapon ", WEP_NAME(self.weapon), " maxshottime is zero!\n"); maxshottime = 1; } makevectors(self.v_angle);