From: Samual Lenks <samual@xonotic.org>
Date: Sun, 3 Mar 2013 16:59:10 +0000 (-0500)
Subject: Fix tuba/accordian/klein bottle
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e54885dc7f31f03cecd9fe7599f435eec4c2ac8f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix tuba/accordian/klein bottle
---

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 43397be00..897ab5539 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -426,18 +426,18 @@ float w_tuba(float req)
 	else if (req == WR_SUICIDEMESSAGE)
 	{
 		if(w_deathtype & HITTYPE_BOUNCE)
-			return WEAPON_ACCORDEON_SUICIDE;
-		else if(w_deathtype & HITTYPE_SECONDARY)
 			return WEAPON_KLEINBOTTLE_SUICIDE;
+		else if(w_deathtype & HITTYPE_SECONDARY)
+			return WEAPON_ACCORDEON_SUICIDE;
 		else
 			return WEAPON_TUBA_SUICIDE;
 	}
 	else if (req == WR_KILLMESSAGE)
 	{
 		if(w_deathtype & HITTYPE_BOUNCE)
-			return WEAPON_ACCORDEON_MURDER;
-		else if(w_deathtype & HITTYPE_SECONDARY)
 			return WEAPON_KLEINBOTTLE_MURDER;
+		else if(w_deathtype & HITTYPE_SECONDARY)
+			return WEAPON_ACCORDEON_MURDER;
 		else
 			return WEAPON_TUBA_MURDER;
 	}