Small tweaks to the weapon reload code, that I also worked on in Xonotic

diff --git a/data/qcsrc/server/bot/havocbot/havocbot.qc b/data/qcsrc/server/bot/havocbot/havocbot.qc
index 6a21f4fa929c649fd4ea7ede62d5cc00c3f34d77..faca874cf3a94df6cad4c435007768b73fa36390 100644 (file)
--- 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);
                        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;
                        }
                }
                                        self.switchweapon = i;
                        }
                }

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index 5ae32e0e6eef71a24e0b92f5f6463acbe462f186..b2706ecd34c002cc9f009ec618dbffd3a0080e7e 100644 (file)
--- 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)
 \r
 void W_DecreaseAmmo(.float ammo_type, float ammo_use, float ammo_reload)\r
 {\r
 \r
 void W_DecreaseAmmo(.float ammo_type, float ammo_use, float ammo_reload)\r
 {\r

-       if(self.items & IT_UNLIMITED_WEAPON_AMMO)\r
+       if((self.items & IT_UNLIMITED_WEAPON_AMMO) && !ammo_reload)\r

                return;\r
 \r
        // if this weapon is reloadable, decrease its load. Else decrease the player's ammo\r
                return;\r
 \r
        // if this weapon is reloadable, decrease its load. Else decrease the player's ammo\r


@@ -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\r
                {\r
                        self.clip_load += 1;\r
                while(self.clip_load < self.reload_ammo_amount && self.(self.current_ammo)) // make sure we don't add more ammo than we have\r
                {\r
                        self.clip_load += 1;\r

-                       self.(self.current_ammo) -= 1;\r
+                       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)\r
+                               self.(self.current_ammo) -= 1;\r

                }\r
        }\r
        self.weapon_load[self.weapon] = self.clip_load;\r
                }\r
        }\r
        self.weapon_load[self.weapon] = self.clip_load;\r