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 f3b91649159d9aef03eda4e9685cd140f036d184..243b32b20e2b0bdbb3b787dec2275f6bba515d79 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -241,14 +241,6 @@ 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
@@ -263,6 +255,14 @@ float w_tuba(float req)
        {
                // nothing to do
        }
+       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