]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix tuba/accordian/klein bottle
authorSamual Lenks <samual@xonotic.org>
Sun, 3 Mar 2013 16:59:10 +0000 (11:59 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 3 Mar 2013 16:59:10 +0000 (11:59 -0500)
qcsrc/server/w_tuba.qc

index 43397be001093c5253dfce01b679d3dd464c91ee..897ab5539d70bbbbb0d4a88d63352371040514ff 100644 (file)
@@ -426,18 +426,18 @@ float w_tuba(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE)
-                       return WEAPON_ACCORDEON_SUICIDE;
-               else if(w_deathtype & HITTYPE_SECONDARY)
                        return WEAPON_KLEINBOTTLE_SUICIDE;
+               else if(w_deathtype & HITTYPE_SECONDARY)
+                       return WEAPON_ACCORDEON_SUICIDE;
                else
                        return WEAPON_TUBA_SUICIDE;
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE)
-                       return WEAPON_ACCORDEON_MURDER;
-               else if(w_deathtype & HITTYPE_SECONDARY)
                        return WEAPON_KLEINBOTTLE_MURDER;
+               else if(w_deathtype & HITTYPE_SECONDARY)
+                       return WEAPON_ACCORDEON_MURDER;
                else
                        return WEAPON_TUBA_MURDER;
        }