From: Mario Date: Thu, 8 May 2014 19:38:01 +0000 (+1000) Subject: Minimum delay to fire is not needed, and normalizing the navigation route does not... X-Git-Tag: xonotic-v0.8.0~200^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4ce40ed31c067628acf5a7359901487531730684;p=xonotic%2Fxonotic-data.pk3dir.git Minimum delay to fire is not needed, and normalizing the navigation route does not fix the error --- diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc index f9f683579..2e57eecb3 100644 --- a/qcsrc/server/bot/havocbot/havocbot.qc +++ b/qcsrc/server/bot/havocbot/havocbot.qc @@ -721,7 +721,7 @@ void havocbot_movetogoal() // avoiding dangers and obstacles vector dst_ahead, dst_down; makevectors(self.v_angle_y * '0 1 0'); - dst_ahead = normalize(self.origin + self.view_ofs + (self.velocity * 0.4) + (v_forward * 32 * 3)); + dst_ahead = self.origin + self.view_ofs + (self.velocity * 0.4) + (v_forward * 32 * 3); dst_down = dst_ahead - '0 0 1500'; // Look ahead diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 29b19e6a1..42dee6a98 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -1092,7 +1092,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) mintime = e.fire_endtime - time; maxtime = max(mintime, t); - mindps = max(0.1, e.fire_damagepersec); + mindps = e.fire_damagepersec; maxdps = max(mindps, dps); if(maxtime > mintime || maxdps > mindps)