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

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

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 29fdab1819713b4c775e628ab3c305091b93fa0c..f6bbf36ce30af3f661ac500bdd6239b26c59077c 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -12,13 +12,7 @@ void W_Fireball_Reload()
        if(self.ammo_fuel < 1)
                self.ammo_fuel = 0;
 
-       self.reload_ammo_player = ammo_fuel;
-       self.reload_ammo_min = min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo);
-       self.reload_ammo_amount = autocvar_g_balance_fireball_reload_ammo;
-       self.reload_time = autocvar_g_balance_fireball_reload_time;
-       self.reload_sound = "weapons/reload.wav";
-
-       W_Reload();
+       W_Reload(ammo_fuel, min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo), autocvar_g_balance_fireball_reload_ammo, autocvar_g_balance_fireball_reload_time, "weapons/reload.wav");
 }
 
 void W_Fireball_Explode (void)