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

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

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index e901a459ec7b9a5e952971259443d0608b6f603a..8da5a271d2930c726e86d8ad4738823474296586 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -11,13 +11,7 @@ REGISTER_WEAPON(CRYLINK, w_crylink, IT_CELLS, 6, WEP_FLAG_NORMAL | WEP_FLAG_RELO
 
 void W_Crylink_Reload()
 {
-       self.reload_ammo_player = ammo_cells;
-       self.reload_ammo_min = min(autocvar_g_balance_crylink_primary_ammo, autocvar_g_balance_crylink_secondary_ammo);
-       self.reload_ammo_amount = autocvar_g_balance_crylink_reload_ammo;
-       self.reload_time = autocvar_g_balance_crylink_reload_time;
-       self.reload_sound = "weapons/reload.wav";
-
-       W_Reload();
+       W_Reload(ammo_cells, min(autocvar_g_balance_crylink_primary_ammo, autocvar_g_balance_crylink_secondary_ammo), autocvar_g_balance_crylink_reload_ammo, autocvar_g_balance_crylink_reload_time, "weapons/reload.wav");
 }
 
 void W_Crylink_CheckLinks(entity e)