X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_tuba.qc;h=c9cfdc4a49951c1f848394f1c727132717bb5490;hb=311e8cc46c69cd2414db2efbf6c911915a980e88;hp=295282f4762277cf45d9f5cad06e91fe0d3ca448;hpb=079c02f9a7c398d6c433f8ead73a244a6833b77b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 295282f47..c9cfdc4a4 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -83,13 +83,14 @@ float W_Tuba_NoteSendEntity(entity to, float sf)
 		WriteCoord(MSG_ENTITY, self.origin_x);
 		WriteCoord(MSG_ENTITY, self.origin_y);
 		WriteCoord(MSG_ENTITY, self.origin_z);
+		WriteByte(MSG_ENTITY, self.owner != to);
 	}
 	return TRUE;
 }
 
 void W_Tuba_NoteThink()
 {
-	float needchange, dist_mult;
+	float dist_mult;
 	float vol0, vol1;
 	vector dir0, dir1;
 	vector v;
@@ -102,7 +103,6 @@ void W_Tuba_NoteThink()
 	}
 	self.nextthink = time;
 	dist_mult = cvar("g_balance_tuba_attenuation") / cvar("snd_soundradius");
-	needchange = 0;
 	FOR_EACH_REALCLIENT(e)
 	if(e != self.owner)
 	{
@@ -131,7 +131,7 @@ void W_Tuba_Attack(float hittype)
 {
 	vector o;
 	float c, n;
-	W_SetupShot(self, FALSE, 2, "", cvar("g_balance_tuba_damage"));
+	W_SetupShot(self, FALSE, 2, "", 0, cvar("g_balance_tuba_damage"));
 	if(self.tuba_notecount)
 	{
 		self.tuba_notecount = FALSE;
@@ -241,20 +241,28 @@ float w_tuba(float req)
 		return TRUE; // TODO use fuel?
 	else if (req == WR_CHECKAMMO2)
 		return TRUE; // TODO use fuel?
-	else if (req == WR_SUICIDEMESSAGE)
-	{
-		w_deathtypestring = "hurt his own ears with the @!#%'n Tuba";
-	}
-	else if (req == WR_KILLMESSAGE)
-	{
-		w_deathtypestring = "died of #'s great playing on the @!#%'n Tuba";
-	}
 	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)
+	{
+		w_deathtypestring = "%s hurt his own ears with the @!#%%'n Tuba";
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		w_deathtypestring = "%s died of %s's great playing on the @!#%%'n Tuba";
+	}
 	return TRUE;
 }
 #endif