From: Mircea Kitsune Date: Fri, 11 Feb 2011 22:45:55 +0000 (+0200) Subject: Better way of checking if we're already holding a weapon we can reload X-Git-Tag: xonotic-v0.5.0~309^2~7^2~31 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b0339823900ccb2199300c28376d30d186cf810b;p=xonotic%2Fxonotic-data.pk3dir.git Better way of checking if we're already holding a weapon we can reload --- diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc index 2b58dd7dc..40c95586d 100644 --- a/qcsrc/server/bot/havocbot/havocbot.qc +++ b/qcsrc/server/bot/havocbot/havocbot.qc @@ -155,17 +155,15 @@ void havocbot_ai() // we are currently holding a weapon that's not fully loaded, reload it if(skill > 2.5) // bots can only reload held weapons on purpose past this skill if(self.clip_load < self.clip_size && self.weapon) - { self.impulse = 20; // "press" the reload button, not sure if this is done right - self.clip_load = -1; - } // if we're not reloading a weapon, switch to any weapon in our invnetory that's not fully loaded to reload it next // the code above executes next frame, starting the reloading then - if(skill >= 5) // bots can only switch to unloaded weapons to reload them past this skill - if(self.clip_load >= 0) + if(skill >= 5) // bots can only look for unloaded weapons past this skill + if(self.clip_load >= 0) // only if we're not reloading a weapon already + if not(self.clip_load < self.clip_size && self.weapon) // we're already holding a weapon we can reload, don't look for another { - for(i = WEP_FIRST; i <= WEP_LAST ; ++i) + for(i = WEP_FIRST; i <= WEP_LAST; ++i) { e = get_weaponinfo(i); if(self.weapon_load[i] < cvar(strcat("g_balance_", e.netname, "_reload_ammo")))