From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 11 Feb 2011 15:52:15 +0000 (+0200)
Subject: Simplify some minstanex code
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~55
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=590486950abd24c3a2cb556f1345dbe3852a9219;p=xonotic%2Fxonotic-data.pk3dir.git

Simplify some minstanex code
---

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 4a720a491..066585548 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -276,10 +276,13 @@ float w_minstanex(float req)
 	}
 	else if (req == WR_RELOAD)
 	{
+		float used_ammo;
 		if(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");
+			used_ammo = min(autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo);
 		else
-			W_Reload(ammo_cells, autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav");
+			used_ammo = autocvar_g_balance_minstanex_ammo;
+
+		W_Reload(ammo_cells, used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav");
 	}
 	return TRUE;
 };