X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minstanex.qc;h=f515d98b5a124b119f164e30e2d765691db6dc14;hb=8f1900cecab47b015eeac137dd7f542164862adc;hp=352aa2b25c6edfee928e7b3541eb51f9b9a58ad5;hpb=aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 352aa2b25..f515d98b5 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -9,7 +9,7 @@ void W_MinstaNex_Attack (void)
 	float flying;
 	flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
 
-	W_SetupShot (self, TRUE, 0, "weapons/minstanexfire.wav", 0);
+	W_SetupShot (self, TRUE, 0, "weapons/minstanexfire.wav", CHAN_WEAPON, 10000);
 
 	yoda = 0;
 	damage_goodhits = 0;
@@ -28,7 +28,6 @@ void W_MinstaNex_Attack (void)
 		if(headshot)
 		{
 			AnnounceTo(self, "headshot");
-			print("h\n");
 		}
 		if(damage_goodhits && self.minstanex_lasthit)
 		{
@@ -44,7 +43,7 @@ void W_MinstaNex_Attack (void)
 	// teamcolor / hit beam effect
 	vector v;
 	v = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
-	if(teamplay)
+	if(teams_matter)
 	{
 	    switch(self.team)
 	    {
@@ -86,7 +85,7 @@ void W_MinstaNex_Attack (void)
 		if (g_minstagib)
 			self.ammo_cells = self.ammo_cells - 1;
 		else
-			self.ammo_cells = self.ammo_cells - cvar("g_balance_minstanex_ammo");
+			self.ammo_cells = self.ammo_cells - autocvar_g_balance_minstanex_ammo;
 	}
 }
 
@@ -179,23 +178,23 @@ float w_minstanex(float req)
 		if(self.ammo_cells>0)
 			self.BUTTON_ATCK = bot_aim(1000000, 0, 1, FALSE);
 		else
-			self.BUTTON_ATCK2 = bot_aim(cvar("g_balance_laser_primary_speed"), 0, cvar("g_balance_laser_primary_lifetime"), FALSE);
+			self.BUTTON_ATCK2 = bot_aim(autocvar_g_balance_laser_primary_speed, 0, autocvar_g_balance_laser_primary_lifetime, FALSE);
 	}
 	else if (req == WR_THINK)
 	{
 		if (self.BUTTON_ATCK)
 		{
-			if (weapon_prepareattack(0, cvar("g_balance_minstanex_refire")))
+			if (weapon_prepareattack(0, autocvar_g_balance_minstanex_refire))
 			{
 				W_MinstaNex_Attack();
-				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_minstanex_animtime"), w_ready);
+				weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_minstanex_animtime, w_ready);
 			}
 		}
 		else if (self.BUTTON_ATCK2)
 		{
 			if (self.jump_interval <= time)
 			{
-				self.jump_interval = time + 0.9 * W_WeaponRateFactor();
+				self.jump_interval = time + autocvar_g_balance_laser_primary_refire * W_WeaponRateFactor();
 
 				// ugly minstagib hack to reuse the fire mode of the laser
 				float w;
@@ -228,7 +227,7 @@ float w_minstanex(float req)
 		if (g_minstagib)
 			return self.ammo_cells >= 1;
 		else
-			return self.ammo_cells >= cvar("g_balance_minstanex_ammo");
+			return self.ammo_cells >= autocvar_g_balance_minstanex_ammo;
 	}
 	else if (req == WR_CHECKAMMO2)
 		return TRUE;