Clean some things

[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 0c2adbc2d51294382f6a1d2392ca8638c63af72d..43397be001093c5253dfce01b679d3dd464c91ee 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -290,8 +290,6 @@ void W_Tuba_NoteOn(float hittype)
                hittype |= HITTYPE_SECONDARY;
        if(self.tuba_instrument & 2)
                hittype |= HITTYPE_BOUNCE;
-       if(self.tuba_instrument & 4)
-               hittype |= HITTYPE_HEADSHOT;
 
        if(self.tuba_note)
        {
@@ -429,18 +427,16 @@ float w_tuba(float req)
        {
                if(w_deathtype & HITTYPE_BOUNCE)
                        return WEAPON_ACCORDEON_SUICIDE;
-               else if(w_deathtype & HITTYPE_HEADSHOT)
+               else if(w_deathtype & HITTYPE_SECONDARY)
                        return WEAPON_KLEINBOTTLE_SUICIDE;
                else
                        return WEAPON_TUBA_SUICIDE;
-
-               return FALSE;
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE)
                        return WEAPON_ACCORDEON_MURDER;
-               else if(w_deathtype & HITTYPE_HEADSHOT)
+               else if(w_deathtype & HITTYPE_SECONDARY)
                        return WEAPON_KLEINBOTTLE_MURDER;
                else
                        return WEAPON_TUBA_MURDER;
@@ -459,6 +455,53 @@ float w_tuba(float req)
        {
                // nothing to do
        }
+/*<<<<<<< HEAD
+=======
+       else if (req == WR_SUICIDEMESSAGE)
+       {
+               float instr;
+               instr = 0;
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       instr |= 1;
+               if(w_deathtype & HITTYPE_BOUNCE)
+                       instr |= 2;
+               switch(instr)
+               {
+                       default:
+                       case 0: // Tuba
+                               w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Tuba");
+                               break;
+                       case 1: // Accordeon
+                               w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Accordeon");
+                               break;
+                       case 2: // Klein Bottle
+                               w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Klein Bottle");
+                               break;
+               }
+       }
+       else if (req == WR_KILLMESSAGE)
+       {
+               float instr;
+               instr = 0;
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       instr |= 1;
+               if(w_deathtype & HITTYPE_BOUNCE)
+                       instr |= 2;
+               switch(instr)
+               {
+                       default:
+                       case 0: // Tuba
+                               w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Tuba");
+                               break;
+                       case 1: // Accordeon
+                               w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Accordeon");
+                               break;
+                       case 2: // Klein Bottle
+                               w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Klein Bottle");
+                               break;
+               }
+       }
+>>>>>>> origin/master*/
        return TRUE;
 }
 #endif