From 87e16369bba93e1e7ca8bec4837417298053a204 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Tue, 15 Mar 2011 00:25:05 +0200 Subject: [PATCH] Small tweaks to the weapon reload code, that I also worked on in Xonotic --- data/qcsrc/server/bot/havocbot/havocbot.qc | 2 +- data/qcsrc/server/cl_weaponsystem.qc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/bot/havocbot/havocbot.qc b/data/qcsrc/server/bot/havocbot/havocbot.qc index 6a21f4fa..faca874c 100644 --- a/data/qcsrc/server/bot/havocbot/havocbot.qc +++ b/data/qcsrc/server/bot/havocbot/havocbot.qc @@ -171,7 +171,7 @@ void havocbot_ai() 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"))) + if ((e.spawnflags & WEP_FLAG_RELOADABLE) && self.weapon_load[i] < cvar(strcat("g_balance_", e.netname, "_reload_ammo"))) self.switchweapon = i; } } diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 5ae32e0e..b2706ecd 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -1548,7 +1548,7 @@ void W_SetupProjectileVelocity(entity missile, float pSpeed, float spread) void W_DecreaseAmmo(.float ammo_type, float ammo_use, float ammo_reload) { - if(self.items & IT_UNLIMITED_WEAPON_AMMO) + if((self.items & IT_UNLIMITED_WEAPON_AMMO) && !ammo_reload) return; // if this weapon is reloadable, decrease its load. Else decrease the player's ammo @@ -1581,7 +1581,8 @@ void W_ReloadedAndReady() while(self.clip_load < self.reload_ammo_amount && self.(self.current_ammo)) // make sure we don't add more ammo than we have { self.clip_load += 1; - self.(self.current_ammo) -= 1; + if not(self.items & IT_UNLIMITED_WEAPON_AMMO) + self.(self.current_ammo) -= 1; } } self.weapon_load[self.weapon] = self.clip_load; -- 2.39.2