Integrate with Transifex.

[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 43397be001093c5253dfce01b679d3dd464c91ee..db4f95385267cb2b6d6e82940cfa4614a4aaa644 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -1,5 +1,16 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(TUBA, w_tuba, 0, 1, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "tuba", "tuba", _("@!#%'n Tuba"))
+REGISTER_WEAPON(
+/* WEP_##id  */ TUBA,
+/* function  */ w_tuba,
+/* ammotype  */ 0,
+/* impulse   */ 1,
+/* flags     */ WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH,
+/* rating    */ BOT_PICKUP_RATING_MID,
+/* model     */ "tuba",
+/* shortname */ "tuba",
+/* xgettext:no-c-format */
+/* fullname  */ _("@!#%'n Tuba")
+);
 #else
 #ifdef SVQC
 //#define TUBA_NOTE(n) strcat("weapons/tuba_note", ftos(n), ".wav")
@@ -186,7 +197,7 @@ float Tuba_GetNote(entity pl, float hittype)
        // that way, holes in the range of notes are "plugged"
        if(teamplay)
        {
-               if(pl.team == FL_TEAM_2 || pl.team == FL_TEAM_4)
+               if(pl.team == NUM_TEAM_2 || pl.team == NUM_TEAM_4)
                        note += 3;
        }
        else
@@ -426,18 +437,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;
        }
@@ -447,61 +458,8 @@ float w_tuba(float req)
 #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
-       }
-/*<<<<<<< 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*/
+       // nothing to do here; particles of tuba are handled differently
+
        return TRUE;
 }
 #endif