X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_tuba.qc;h=6b3287b59ed1ee29b1e0ee8228e89e819f0b04b0;hb=2c3d9f6a5a8c286aac7ca0d5192225d39532297f;hp=43397be001093c5253dfce01b679d3dd464c91ee;hpb=54f4843b201d2b22942457df5b50ddc0c48ed8d2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 43397be00..6b3287b59 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -186,7 +186,7 @@ float Tuba_GetNote(entity pl, float hittype)
 	// that way, holes in the range of notes are "plugged"
 	if(teamplay)
 	{
-		if(pl.team == FL_TEAM_2 || pl.team == FL_TEAM_4)
+		if(pl.team == NUM_TEAM_2 || pl.team == NUM_TEAM_4)
 			note += 3;
 	}
 	else
@@ -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;
 	}
@@ -447,61 +447,8 @@ float w_tuba(float req)
 #ifdef CSQC
 float w_tuba(float req)
 {
-	if(req == WR_IMPACTEFFECT)
-	{
-		// nothing to do here; particles of tuba are handled differently
-	}
-	else if(req == WR_PRECACHE)
-	{
-		// nothing to do
-	}
-/*<<<<<<< HEAD
-=======
-	else if (req == WR_SUICIDEMESSAGE)
-	{
-		float instr;
-		instr = 0;
-		if(w_deathtype & HITTYPE_SECONDARY)
-			instr |= 1;
-		if(w_deathtype & HITTYPE_BOUNCE)
-			instr |= 2;
-		switch(instr)
-		{
-			default:
-			case 0: // Tuba
-				w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Tuba");
-				break;
-			case 1: // Accordeon
-				w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Accordeon");
-				break;
-			case 2: // Klein Bottle
-				w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Klein Bottle");
-				break;
-		}
-	}
-	else if (req == WR_KILLMESSAGE)
-	{
-		float instr;
-		instr = 0;
-		if(w_deathtype & HITTYPE_SECONDARY)
-			instr |= 1;
-		if(w_deathtype & HITTYPE_BOUNCE)
-			instr |= 2;
-		switch(instr)
-		{
-			default:
-			case 0: // Tuba
-				w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Tuba");
-				break;
-			case 1: // Accordeon
-				w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Accordeon");
-				break;
-			case 2: // Klein Bottle
-				w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Klein Bottle");
-				break;
-		}
-	}
->>>>>>> origin/master*/
+	// nothing to do here; particles of tuba are handled differently
+
 	return TRUE;
 }
 #endif