From: Rudolf Polzer Date: Mon, 10 May 2010 11:10:37 +0000 (+0200) Subject: fix another seeker bug, and fix a division by zero in havocbots X-Git-Tag: xonotic-v0.1.0preview~628^2~10 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7030695ebd3b1219613b92edb95f2f2409de46c7;p=xonotic%2Fxonotic-data.pk3dir.git fix another seeker bug, and fix a division by zero in havocbots --- diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc index 0e51f9582..2b86c27ad 100644 --- a/qcsrc/server/bot/havocbot/havocbot.qc +++ b/qcsrc/server/bot/havocbot/havocbot.qc @@ -162,8 +162,8 @@ void havocbot_keyboard_movement(vector destorg) self.havocbot_keyboardtime = max( self.havocbot_keyboardtime - + bound(0,0.05/(sk+self.havocbot_keyboardskill),0.05) - +random()*bound(0,0.025/(skill+self.havocbot_keyboardskill),100) + + 0.05/max(1, sk+self.havocbot_keyboardskill) + + random()*0.025/max(0.00025, skill+self.havocbot_keyboardskill) , time); keyboard = self.movement * (1.0 / maxspeed); diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index a7cb61805..25e57523a 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -216,9 +216,9 @@ void Seeker_Vollycontroler_Think() entity oldself,oldenemy; self.cnt = self.cnt - 1; - if not(self.items & IT_UNLIMITED_WEAPON_AMMO) - if ((self.owner.ammo_rockets < cvar("g_balance_seeker_missile_ammo")) || (self.cnt <= -1) || (self.owner.deadflag != DEAD_NO)) + if((!(self.owner.items & IT_UNLIMITED_AMMO) && self.owner.ammo_rockets < cvar("g_balance_seeker_missile_ammo")) || (self.cnt <= -1) || (self.owner.deadflag != DEAD_NO)) { + print("cannot\n"); remove(self); return; }