Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

[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 05329cf46dcef90dcd1297832602c1aff30aac74..15d4ef9d7deb44e9d6690fff01c77cbde572735d 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -148,6 +148,9 @@ float Tuba_GetNote(entity pl, float hittype)
        if(pl.movement_x > 0) movestate += 3;
        if(pl.movement_y < 0) movestate -= 1;
        if(pl.movement_y > 0) movestate += 1;
+#ifdef GMQCC
+       note = 0;
+#endif
        switch(movestate)
        {
        // layout: originally I wanted
@@ -430,8 +433,6 @@ float w_tuba(float req)
                        return WEAPON_KLEINBOTTLE_SUICIDE;
                else
                        return WEAPON_TUBA_SUICIDE;
-
-               return FALSE;
        }
        else if (req == WR_KILLMESSAGE)
        {