X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_fireball.qc;h=6b98d37cd7404b024f8252e55b49307d58ecf4c1;hb=c411540140fa2a0763fe23c38957dbd75afb1e05;hp=d5c0b13f950fcc72542db32c4cd6a11c917ba122;hpb=5edeb786a80b4ea0254d504f655447174375b7e3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index d5c0b13f9..6b98d37cd 100644
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -323,13 +323,13 @@ float w_fireball(float req)
 	{
 		if (self.BUTTON_ATCK)
 		if (time >= self.fireball_primarytime)
-		if (weapon_prepareattack(1, cvar("g_balance_fireball_primary_refire")))
+		if (weapon_prepareattack(0, cvar("g_balance_fireball_primary_refire")))
 		{
 			W_Fireball_Attack1_Frame0();
 			self.fireball_primarytime = time + cvar("g_balance_fireball_primary_refire2");
 		}
 		if (self.BUTTON_ATCK2)
-		if (weapon_prepareattack(0, cvar("g_balance_fireball_secondary_refire")))
+		if (weapon_prepareattack(1, cvar("g_balance_fireball_secondary_refire")))
 		{
 			W_Fireball_Attack2();
 			weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_fireball_secondary_animtime"), w_ready);
@@ -351,41 +351,6 @@ float w_fireball(float req)
 		return self.ammo_fuel >= cvar("g_balance_fireball_primary_ammo");
 	else if (req == WR_CHECKAMMO2)
 		return self.ammo_fuel >= cvar("g_balance_fireball_secondary_ammo");
-	else if (req == WR_SUICIDEMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_SECONDARY)
-			w_deathtypestring = "forgot about some firemine";
-		else
-			w_deathtypestring = "should have used a smaller gun";
-	}
-	else if (req == WR_KILLMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_SECONDARY)
-		{
-			if(w_deathtype & HITTYPE_HEADSHOT)
-				w_deathtypestring = "tried to catch #'s firemine";
-			else
-				w_deathtypestring = "fatefully ignored #'s firemine";
-		}
-		else
-		{
-			if(w_deathtype & HITTYPE_BOUNCE)
-			{
-				if(w_deathtype & HITTYPE_SPLASH) // BFG effect
-				{
-					w_deathtypestring = "could not hide from #'s fireball";
-				}
-				else // laser
-				{
-					w_deathtypestring = "saw the pretty lights of #'s fireball";
-				}
-			}
-			else if(w_deathtype & HITTYPE_SPLASH)
-				w_deathtypestring = "got too close to #'s fireball";
-			else
-				w_deathtypestring = "tasted #'s fireball";
-		}
-	}
 	else if (req == WR_RESETPLAYER)
 	{
 		self.fireball_primarytime = time;
@@ -413,9 +378,39 @@ float w_fireball(float req)
 	}
 	else if(req == WR_PRECACHE)
 	{
-		precache_sound("weapons/fireball_impact.wav");
 		precache_sound("weapons/fireball_impact2.wav");
 	}
+	else if (req == WR_SUICIDEMESSAGE)
+	{
+		if(w_deathtype & HITTYPE_SECONDARY)
+			w_deathtypestring = "%s forgot about some firemine";
+		else
+			w_deathtypestring = "%s should have used a smaller gun";
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		if(w_deathtype & HITTYPE_SECONDARY)
+		{
+			if(w_deathtype & HITTYPE_HEADSHOT)
+				w_deathtypestring = "%s tried to catch %s's firemine";
+			else
+				w_deathtypestring = "%s fatefully ignored %s's firemine";
+		}
+		else
+		{
+			if(w_deathtype & HITTYPE_BOUNCE)
+			{
+				if(w_deathtype & HITTYPE_SPLASH) // BFG effect
+					w_deathtypestring = "%s could not hide from %s's fireball";
+				else // laser
+					w_deathtypestring = "%s saw the pretty lights of %s's fireball";
+			}
+			else if(w_deathtype & HITTYPE_SPLASH)
+				w_deathtypestring = "%s got too close to %s's fireball";
+			else
+				w_deathtypestring = "%s tasted %s's fireball";
+		}
+	}
 	return TRUE;
 }
 #endif