X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minstanex.qc;h=8efda9b07f279cea118cf0fd330f6455474d4d52;hb=9cdc5ecff03fff6fe2feef2341a33806aa110a97;hp=4a720a4914007ebdc1e9f1784f2c722ad0ec8f3e;hpb=03914e08e75d005bef83e6999f07dbe08acd3718;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 4a720a491..8efda9b07 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -80,25 +80,10 @@ void W_MinstaNex_Attack (void)
 	if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT))
 		Damage_DamageInfo(trace_endpos, 10000, 0, 0, 800 * w_shotdir, WEP_MINSTANEX, self);
 
-	// if this weapon is reloadable, decrease its load. Else decrease the player's ammo
-	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-	{
-		if(autocvar_g_balance_minstanex_reload_ammo)
-		{
-			if (g_minstagib)
-				self.clip_load -= - 1;
-			else
-				self.clip_load -= autocvar_g_balance_minstanex_ammo;
-			self.weapon_load[WEP_MINSTANEX] = self.clip_load;
-		}
-		else
-		{
-			if (g_minstagib)
-				self.ammo_cells -= - 1;
-			else
-				self.ammo_cells -= autocvar_g_balance_minstanex_ammo;
-		}
-	}
+	if (g_minstagib)
+		W_DecreaseAmmo(ammo_cells, 1, autocvar_g_balance_minstanex_reload_ammo);
+	else
+		W_DecreaseAmmo(ammo_cells, autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_reload_ammo);
 }
 
 
@@ -222,12 +207,7 @@ float w_minstanex(float req)
 
 				// decrease ammo for the laser?
 				if(autocvar_g_balance_minstanex_laser_ammo)
-				{
-					if(autocvar_g_balance_minstanex_reload_ammo)
-						self.clip_load -= autocvar_g_balance_minstanex_laser_ammo;
-					else
-						self.ammo_cells -= autocvar_g_balance_minstanex_laser_ammo;
-				}
+					W_DecreaseAmmo(ammo_cells, autocvar_g_balance_minstanex_laser_ammo, autocvar_g_balance_minstanex_reload_ammo);
 
 				// ugly minstagib hack to reuse the fire mode of the laser
 				float w;
@@ -248,12 +228,13 @@ float w_minstanex(float req)
 		precache_sound ("weapons/nexwhoosh1.wav");
 		precache_sound ("weapons/nexwhoosh2.wav");
 		precache_sound ("weapons/nexwhoosh3.wav");
-		precache_sound ("weapons/reload.wav");
+		//precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound somewhere else
 		w_laser(WR_PRECACHE);
 	}
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_MINSTANEX);
+		self.current_ammo = ammo_cells;
 		self.minstanex_lasthit = 0;
 	}
 	else if (req == WR_CHECKAMMO1)
@@ -276,10 +257,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(used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav");
 	}
 	return TRUE;
 };