X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_tuba.qc;h=491030fcbcc486cfde1249c03d5d560e09b22bb4;hb=ac33435fe636aaad7210e1a8f9f723f6134a7823;hp=eab14f4f516d62da409e3c2ada398c8afb81b9ce;hpb=715202f719f244160bfc0b004013fa6e1bcc5668;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index eab14f4f5..491030fcb 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(TUBA, w_tuba, 0, 1, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "tuba", "tuba", "@!#%'n Tuba");
 #else
+#ifdef SVQC
 //#define TUBA_NOTE(n) strcat("weapons/tuba_note", ftos(n), ".wav")
 .float tuba_notecount;
 .entity tuba_note;
@@ -82,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;
@@ -101,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)
 	{
@@ -240,14 +241,29 @@ 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)
 	{
-		w_deathtypestring = "hurt his own ears with the @!#%'n Tuba";
+		w_deathtypestring = "%s hurt his own ears with the @!#%%'n Tuba";
 	}
 	else if (req == WR_KILLMESSAGE)
 	{
-		w_deathtypestring = "died of #'s great playing on the @!#%'n Tuba";
+		w_deathtypestring = "%s died of %s's great playing on the @!#%%'n Tuba";
 	}
 	return TRUE;
-};
+}
+#endif
 #endif