X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_tuba.qc;h=f70aa044312b803773c89931f4912ae59ef6a8b2;hp=999749b3e01d16783fc46c59ccec45fe59461d9e;hb=e0ac5f9f14e169a1e19d0e36b85cab061a74ed93;hpb=b389aba1bd8f5cfbabf3f5958f0e430f202bdff0

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 999749b3e..f70aa0443 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -1,5 +1,16 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(TUBA, w_tuba, 0, 1, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "tuba", "tuba", _("@!#%'n Tuba"))
+REGISTER_WEAPON(
+/* WEP_##id  */ TUBA,
+/* function  */ w_tuba,
+/* ammotype  */ 0,
+/* impulse   */ 1,
+/* flags     */ WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH,
+/* rating    */ BOT_PICKUP_RATING_MID,
+/* model     */ "tuba",
+/* shortname */ "tuba",
+/* xgettext:no-c-format */
+/* fullname  */ _("@!#%'n Tuba")
+);
 #else
 #ifdef SVQC
 //#define TUBA_NOTE(n) strcat("weapons/tuba_note", ftos(n), ".wav")
@@ -148,6 +159,9 @@ float Tuba_GetNote(entity pl, float hittype)
 	if(pl.movement_x > 0) movestate += 3;
 	if(pl.movement_y < 0) movestate -= 1;
 	if(pl.movement_y > 0) movestate += 1;
+#ifdef GMQCC
+	note = 0;
+#endif
 	switch(movestate)
 	{
 	// layout: originally I wanted
@@ -176,14 +190,14 @@ float Tuba_GetNote(entity pl, float hittype)
 		note += 12;
 	if(hittype & HITTYPE_SECONDARY)
 		note += 7;
-	
+
 	// we support two kinds of tubas, those tuned in Eb and those tuned in C
 	// kind of tuba currently is player slot number, or team number if in
 	// teamplay
 	// that way, holes in the range of notes are "plugged"
 	if(teamplay)
 	{
-		if(pl.team == COLOR_TEAM2 || pl.team == COLOR_TEAM4)
+		if(pl.team == NUM_TEAM_2 || pl.team == NUM_TEAM_4)
 			note += 3;
 	}
 	else
@@ -191,7 +205,7 @@ float Tuba_GetNote(entity pl, float hittype)
 		if(pl.clientcolors & 1)
 			note += 3;
 	}
-	
+
 	// total range of notes:
 	//                       0
 	//                 ***  ** ****
@@ -287,8 +301,6 @@ void W_Tuba_NoteOn(float hittype)
 		hittype |= HITTYPE_SECONDARY;
 	if(self.tuba_instrument & 2)
 		hittype |= HITTYPE_BOUNCE;
-	if(self.tuba_instrument & 4)
-		hittype |= HITTYPE_HEADSHOT;
 
 	if(self.tuba_note)
 	{
@@ -301,7 +313,7 @@ void W_Tuba_NoteOn(float hittype)
 		}
 	}
 
-	if not(self.tuba_note)
+	if (!self.tuba_note)
 	{
 		self.tuba_note = spawn();
 		self.tuba_note.owner = self.tuba_note.realowner = self;
@@ -422,69 +434,33 @@ float w_tuba(float req)
 		return TRUE; // TODO use fuel?
 	else if (req == WR_CHECKAMMO2)
 		return TRUE; // TODO use fuel?
-	return TRUE;
-}
-#endif
-#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
-	}
 	else if (req == WR_SUICIDEMESSAGE)
 	{
-		float instr;
-		instr = 0;
-		if(w_deathtype & HITTYPE_SECONDARY)
-			instr |= 1;
 		if(w_deathtype & HITTYPE_BOUNCE)
-			instr |= 2;
-		if(w_deathtype & HITTYPE_HEADSHOT)
-			instr |= 4;
-		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;
-		}
+			return WEAPON_KLEINBOTTLE_SUICIDE;
+		else if(w_deathtype & HITTYPE_SECONDARY)
+			return WEAPON_ACCORDEON_SUICIDE;
+		else
+			return WEAPON_TUBA_SUICIDE;
 	}
 	else if (req == WR_KILLMESSAGE)
 	{
-		float instr;
-		instr = 0;
-		if(w_deathtype & HITTYPE_SECONDARY)
-			instr |= 1;
 		if(w_deathtype & HITTYPE_BOUNCE)
-			instr |= 2;
-		if(w_deathtype & HITTYPE_HEADSHOT)
-			instr |= 4;
-		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;
-		}
+			return WEAPON_KLEINBOTTLE_MURDER;
+		else if(w_deathtype & HITTYPE_SECONDARY)
+			return WEAPON_ACCORDEON_MURDER;
+		else
+			return WEAPON_TUBA_MURDER;
 	}
 	return TRUE;
 }
 #endif
+#ifdef CSQC
+float w_tuba(float req)
+{
+	// nothing to do here; particles of tuba are handled differently
+
+	return TRUE;
+}
+#endif
 #endif