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

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

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 92775d210013a8edf6468fe198f8166fef7975cb..4f4329d01277eea4b9814e75a7bb85376cd34599 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -7,13 +7,7 @@ REGISTER_WEAPON(ELECTRO, w_electro, IT_CELLS, 5, WEP_FLAG_NORMAL | WEP_FLAG_RELO
 
 void W_Electro_Reload()
 {
-       self.reload_ammo_player = ammo_cells;
-       self.reload_ammo_min = min(autocvar_g_balance_electro_primary_ammo, autocvar_g_balance_electro_secondary_ammo);
-       self.reload_ammo_amount = autocvar_g_balance_electro_reload_ammo;
-       self.reload_time = autocvar_g_balance_electro_reload_time;
-       self.reload_sound = "weapons/reload.wav";
-
-       W_Reload();
+       W_Reload(ammo_cells, min(autocvar_g_balance_electro_primary_ammo, autocvar_g_balance_electro_secondary_ammo), autocvar_g_balance_electro_reload_ammo, autocvar_g_balance_electro_reload_time, "weapons/reload.wav");
 }
 
 void W_Plasma_Explode_Combo (void);