Merge branch 'master' into divVerent/fruitbalance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_tuba.qc

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 0ba1aae3e3ef10a06606992f035cabbfc211522f..243b32b20e2b0bdbb3b787dec2275f6bba515d79 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -241,6 +241,20 @@ 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";
@@ -250,8 +264,6 @@ float w_tuba(float req)
                w_deathtypestring = "died of #'s great playing on the @!#%'n Tuba";
        }
        return TRUE;
-};
-#endif
-#ifdef CSQC
+}
 #endif
 #endif