X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_grenadelauncher.qc;h=a7d9a4935d7202a7a4a2bf18975cdafb4b1c5af1;hp=b340f76c90bc79f2eaa85c0f83076ddddbadce3e;hb=3f45576484bbc936a1aa097e8a93704aa7872632;hpb=83b0c96edec0a188371873bb83b15d024568bca3

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index b340f76c9..a7d9a4935 100644
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -217,23 +217,6 @@ float w_glauncher(float req)
 		return self.ammo_rockets >= cvar("g_balance_grenadelauncher_primary_ammo");
 	else if (req == WR_CHECKAMMO2)
 		return self.ammo_rockets >= cvar("g_balance_grenadelauncher_secondary_ammo");
-	else if (req == WR_SUICIDEMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_SECONDARY)
-			w_deathtypestring = "tried out his own grenade";
-		else
-			w_deathtypestring = "detonated";
-	}
-	else if (req == WR_KILLMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_SPLASH)
-			if(w_deathtype & HITTYPE_BOUNCE) // (must be secondary then)
-				w_deathtypestring = "didn't see #'s grenade";
-			else // unchecked: SECONDARY
-				w_deathtypestring = "almost dodged #'s grenade";
-		else // unchecked: SECONDARY, BOUNCE
-			w_deathtypestring = "ate #'s grenade";
-	}
 	return TRUE;
 };
 #endif
@@ -252,6 +235,23 @@ float w_glauncher(float req)
 	{
 		precache_sound("weapons/grenade_impact.wav");
 	}
+	else if (req == WR_SUICIDEMESSAGE)
+	{
+		if(w_deathtype & HITTYPE_SECONDARY)
+			w_deathtypestring = "tried out his own grenade";
+		else
+			w_deathtypestring = "detonated";
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		if(w_deathtype & HITTYPE_SPLASH)
+			if(w_deathtype & HITTYPE_BOUNCE) // (must be secondary then)
+				w_deathtypestring = "didn't see #'s grenade";
+			else // unchecked: SECONDARY
+				w_deathtypestring = "almost dodged #'s grenade";
+		else // unchecked: SECONDARY, BOUNCE
+			w_deathtypestring = "ate #'s grenade";
+	}
 	return TRUE;
 }
 #endif