Fix ammo types

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index a3ba552b934c89cda7f9c94d4d8c88c2022c3bfc..0e4e0b852e617992dcb1b6d8636cfb3626471163 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -19,7 +19,7 @@ void W_GrenadeLauncher_SetAmmoCounter()
 
 void W_GrenadeLauncher_Reload()
 {
-       self.reload_ammo_player = ammo_fuel;
+       self.reload_ammo_player = ammo_rockets;
        self.reload_ammo_min = min(autocvar_g_balance_grenadelauncher_primary_ammo, autocvar_g_balance_grenadelauncher_secondary_ammo);
        self.reload_ammo_amount = autocvar_g_balance_grenadelauncher_reload_ammo;
        self.reload_time = autocvar_g_balance_grenadelauncher_reload_time;

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index bb27001ba03bd0a99311ba7ad26973a0f3dca365..2913ff2f3517963f070d3b76c80a4f99200f74f5 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -17,7 +17,7 @@ void W_HLAC_SetAmmoCounter()
 
 void W_HLAC_Reload()
 {
-       self.reload_ammo_player = ammo_fuel;
+       self.reload_ammo_player = ammo_cells;
        self.reload_ammo_min = min(autocvar_g_balance_hlac_primary_ammo, autocvar_g_balance_hlac_secondary_ammo);
        self.reload_ammo_amount = autocvar_g_balance_hlac_reload_ammo;
        self.reload_time = autocvar_g_balance_hlac_reload_time;

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 5739d6e45701dd1909bd5982ee363ae3377fe31f..3db7ad4f7af96ce9177c9a817744db3393f109d8 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -20,7 +20,7 @@ void W_MineLayer_SetAmmoCounter()
 
 void W_MineLayer_Reload()
 {
-       self.reload_ammo_player = ammo_fuel;
+       self.reload_ammo_player = ammo_rockets;
        self.reload_ammo_min = autocvar_g_balance_minelayer_ammo;
        self.reload_ammo_amount = autocvar_g_balance_minelayer_reload_ammo;
        self.reload_time = autocvar_g_balance_minelayer_reload_time;

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 91132e7d20ba01764c9245ff1761a4a128ec77c3..de6fcff245aab96454ccc55d6240b014977bb42c 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -18,7 +18,7 @@ void W_Minstanex_SetAmmoCounter()
 
 void W_Minstanex_Reload()
 {
-       self.reload_ammo_player = ammo_fuel;
+       self.reload_ammo_player = ammo_cells;
        if(autocvar_g_balance_minstanex_laser_ammo)
                self.reload_ammo_min = min(autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo);
        else

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index fd0cbf9ab8b1f7da027379cd7e45c6cb909a2bb2..66aea0563866d3e66cda44195223fd9d30427094 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -17,7 +17,7 @@ void W_Nex_SetAmmoCounter()
 
 void W_Nex_Reload()
 {
-       self.reload_ammo_player = ammo_fuel;
+       self.reload_ammo_player = ammo_cells;
        self.reload_ammo_min = min(autocvar_g_balance_nex_primary_ammo, autocvar_g_balance_nex_secondary_ammo);
        self.reload_ammo_amount = autocvar_g_balance_nex_reload_ammo;
        self.reload_time = autocvar_g_balance_nex_reload_time;

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index 50b9ad0aad554a8f061dcc0b858bc049f486d999..1198bc74199f01ee29f1e017b9074d4cd2b8b9e0 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -19,7 +19,7 @@ void W_RocketLauncher_SetAmmoCounter()
 
 void W_RocketLauncher_Reload()
 {
-       self.reload_ammo_player = ammo_fuel;
+       self.reload_ammo_player = ammo_rockets;
        self.reload_ammo_min = autocvar_g_balance_rocketlauncher_ammo;
        self.reload_ammo_amount = autocvar_g_balance_rocketlauncher_reload_ammo;
        self.reload_time = autocvar_g_balance_rocketlauncher_reload_time;

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index d3b7f45789b977523b810b807ed8c51d05443a90..18c5bc95ad7cbf6548650b7629588a960ff50c7f 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -19,7 +19,7 @@ void W_Seeker_SetAmmoCounter()
 
 void W_Seeker_Reload()
 {
-       self.reload_ammo_player = ammo_fuel;
+       self.reload_ammo_player = ammo_rockets;
        self.reload_ammo_min = min(autocvar_g_balance_seeker_missile_ammo, autocvar_g_balance_seeker_tag_ammo);
        self.reload_ammo_amount = autocvar_g_balance_seeker_reload_ammo;
        self.reload_time = autocvar_g_balance_seeker_reload_time;

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index c355fc19d712775f6b83908389888653e44ecc09..68b4ab2b18408e47976b82088dbfb405e0b5df9f 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -17,7 +17,7 @@ void W_Shotgun_SetAmmoCounter()
 
 void W_Shotgun_Reload()
 {
-       self.reload_ammo_player = ammo_fuel;
+       self.reload_ammo_player = ammo_shells;
        self.reload_ammo_min = autocvar_g_balance_shotgun_primary_ammo;
        self.reload_ammo_amount = autocvar_g_balance_shotgun_reload_ammo;
        self.reload_time = autocvar_g_balance_shotgun_reload_time;

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index 34fab001ee14afd932a86480e0f79e3775f688c9..61479539688c0fa880b438f1215404a2d83eb609 100644 (file)
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -22,7 +22,7 @@ void W_SniperRifle_SetAmmoCounter()
 
 void W_SniperRifle_Reload()
 {
-       self.reload_ammo_player = ammo_fuel;
+       self.reload_ammo_player = ammo_nails;
        self.reload_ammo_min = min(autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo);
        self.reload_ammo_amount = autocvar_g_balance_sniperrifle_reload_ammo;
        self.reload_time = autocvar_g_balance_sniperrifle_reload_time;

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index 9ceb48f534a933c70eb8dab7bf109f7c55cf2354..0482f43772918bcc7525899ec304bf3b384d8eaf 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -17,7 +17,7 @@ void W_UZI_SetAmmoCounter()
 
 void W_UZI_Reload()
 {
-       self.reload_ammo_player = ammo_fuel;
+       self.reload_ammo_player = ammo_nails;
        self.reload_ammo_min = min(max(autocvar_g_balance_uzi_sustained_ammo, autocvar_g_balance_uzi_first_ammo), autocvar_g_balance_uzi_burst_ammo);
        self.reload_ammo_amount = autocvar_g_balance_uzi_reload_ammo;
        self.reload_time = autocvar_g_balance_uzi_reload_time;