X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_tuba.qc;h=c89735e55930fc81a8f8bc752890c5bd1fa1f73d;hb=7d4817e8d3a289c12d103768b0a89df09c1573d7;hp=9074ba84926ad12e4d85729cf2b55a1cc14c9318;hpb=0e7ed909bffb4ff21f0c68d163edfc17487e380a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 9074ba849..c89735e55 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;
@@ -228,7 +229,7 @@ float w_tuba(float req)
 	{
 		precache_model ("models/weapons/g_tuba.md3");
 		precache_model ("models/weapons/v_tuba.md3");
-		precache_model ("models/weapons/h_tuba.dpm");
+		precache_model ("models/weapons/h_tuba.iqm");
 
 		//float i;
 		//for(i = -18; i <= +27; ++i)
@@ -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