Fix Rocket Launcher and Mine Layer ammo check code

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 00a836eb8e556e2eb72a72c9ee967be849fabf24..b5ca7aa14d692417f0487f2e1501c08fe2a41255 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -482,12 +482,15 @@ float w_minelayer(float req)
                // don't switch while placing a mine
                if (ATTACK_FINISHED(self) <= time || self.weapon != WEP_MINE_LAYER)
                {
-                       if(self.ammo_rockets < autocvar_g_balance_minelayer_ammo)
-                               ammo_amount = FALSE;
-                       if(autocvar_g_balance_electro_reload_ammo && self.minelayer_load < autocvar_g_balance_minelayer_ammo)
-                               ammo_amount = FALSE;
+                       if(autocvar_g_balance_minelayer_reload_ammo)
+                       {
+                               if(self.ammo_rockets < autocvar_g_balance_minelayer_ammo && self.minelayer_load < autocvar_g_balance_minelayer_ammo)
+                                       ammo_amount = TRUE;
+                       }
+                       else if(self.ammo_rockets < autocvar_g_balance_minelayer_ammo)
+                               ammo_amount = TRUE;
+                       return !ammo_amount;
                }
-               return ammo_amount;
        }
        else if (req == WR_CHECKAMMO2)
        {

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index 471350484faa4b0109272f4e345a3ddbf4a2d8d1..cb639430bb507d16a5d1c6fa48d414e1d75b3783 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -523,12 +523,15 @@ float w_rlauncher(float req)
                // don't switch while guiding a missile
                if (ATTACK_FINISHED(self) <= time || self.weapon != WEP_ROCKET_LAUNCHER)
                {
-                       if(self.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo)
-                               ammo_amount = FALSE;
-                       if(autocvar_g_balance_electro_reload_ammo && self.minelayer_load < autocvar_g_balance_rocketlauncher_ammo)
-                               ammo_amount = FALSE;
+                       if(autocvar_g_balance_rocketlauncher_reload_ammo)
+                       {
+                               if(self.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo && self.rocketlauncher_load < autocvar_g_balance_rocketlauncher_ammo)
+                                       ammo_amount = TRUE;
+                       }
+                       else if(self.ammo_rockets < autocvar_g_balance_rocketlauncher_ammo)
+                               ammo_amount = TRUE;
+                       return !ammo_amount;
                }
-               return ammo_amount;
        }
        else if (req == WR_CHECKAMMO2)
                return FALSE;