Port new code to all weapons, part 1

[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 9d4bdec4b7c67246db0d00b4f0988bc7131938e3..9981ad2692749ee3da2a2b8c9197a46d32ac7fe9 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -19,49 +19,18 @@ void W_Minstanex_SetAmmoCounter()
        }
 }
 
-void W_Minstanex_ReloadedAndReady()
-{
-       float t;
-
-       // now do the ammo transfer
-       self.clip_load = self.old_clip_load; // restore the ammo counter, in case we still had ammo in the weapon before reloading
-       while(self.clip_load < autocvar_g_balance_minstanex_reload_ammo && self.ammo_cells) // make sure we don't add more ammo than we have
-       {
-               self.clip_load += 1;
-               self.ammo_cells -= 1;
-       }
-       self.minstanex_load = self.clip_load;
-
-       t = ATTACK_FINISHED(self) - autocvar_g_balance_minstanex_reload_time - 1;
-       ATTACK_FINISHED(self) = t;
-       w_ready();
-}
-
 void W_Minstanex_Reload()
 {
-       // return if reloading is disabled for this weapon
-       if(!autocvar_g_balance_minstanex_reload_ammo)
-               return;
-
+       self.reload_ammo_player = ammo_fuel;
        if(autocvar_g_balance_minstanex_laser_ammo)
-       {
-               if(!W_ReloadCheck(self.ammo_cells, min(autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo)))
-                       return;
-       }
-       else if(!W_ReloadCheck(self.ammo_cells, autocvar_g_balance_minstanex_ammo))
-               return;
-
-       float t;
-
-       sound (self, CHAN_WEAPON2, "weapons/reload.wav", VOL_BASE, ATTN_NORM);
-
-       t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_minstanex_reload_time + 1;
-       ATTACK_FINISHED(self) = t;
-
-       weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_minstanex_reload_time, W_Minstanex_ReloadedAndReady);
+               self.reload_ammo_min = min(autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo);
+       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";
 
-       self.old_clip_load = self.clip_load;
-       self.clip_load = -1;
+       W_Reload();
 }
 
 void W_MinstaNex_Attack (void)