Attempt to further simplify the reload code, as requested. First part of the first...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_minstanex.qc

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 267bc2547fd4c955b9be022e904e0a24eadec280..30212b4f17eaa7ffbd126982afa368e05cce6e4b 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -6,16 +6,10 @@ REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_
 
 void W_Minstanex_Reload()
 {
-       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);
+               W_Reload(ammo_cells, min(autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo), autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav");
        else
-               self.reload_ammo_min = autocvar_g_balance_minstanex_ammo;
-       self.reload_ammo_amount = autocvar_g_balance_minstanex_reload_ammo;
-       self.reload_time = autocvar_g_balance_minstanex_reload_time;
-       self.reload_sound = "weapons/reload.wav";
-
-       W_Reload();
+               W_Reload(ammo_cells, autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav");
 }
 
 void W_MinstaNex_Attack (void)