Don't do the full WEP_id for these, not necessary

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / w_tuba.qc

diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc
index 8d095787ba34d697aab1396c5e648bd0d879c7b5..a68ba575af8dcb450be7b5ad98db70b515796ce1 100644 (file)
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -8,24 +8,29 @@ REGISTER_WEAPON(
 /* rating   */ BOT_PICKUP_RATING_MID,
 /* model    */ "tuba",
 /* netname  */ "tuba",
-/* fullname */ _("@!#%'n Tuba")
+/* xgettext:no-c-format */
+/* fullname  */ _("@!#%'n Tuba")
 );
 
-#define TUBA_SETTINGS(weapon) \
-       WEP_ADD_CVAR(weapon, MO_NONE, animtime) \
-       WEP_ADD_CVAR(weapon, MO_NONE, attenuation) \
-       WEP_ADD_CVAR(weapon, MO_NONE, damage) \
-       WEP_ADD_CVAR(weapon, MO_NONE, edgedamage) \
-       WEP_ADD_CVAR(weapon, MO_NONE, force) \
-       WEP_ADD_CVAR(weapon, MO_NONE, radius) \
-       WEP_ADD_CVAR(weapon, MO_NONE, refire) \
-       WEP_ADD_PROP(weapon, reloading_ammo, reload_ammo) \
-       WEP_ADD_PROP(weapon, reloading_time, reload_time) \
-       WEP_ADD_PROP(weapon, switchdelay_raise, switchdelay_raise) \
-       WEP_ADD_PROP(weapon, switchdelay_drop, switchdelay_drop)
+#define TUBA_SETTINGS(w_cvar,w_prop) TUBA_SETTINGS_LIST(w_cvar, w_prop, TUBA, tuba)
+#define TUBA_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
+       w_cvar(id, sn, MO_NONE, animtime) \
+       w_cvar(id, sn, MO_NONE, attenuation) \
+       w_cvar(id, sn, MO_NONE, damage) \
+       w_cvar(id, sn, MO_NONE, edgedamage) \
+       w_cvar(id, sn, MO_NONE, force) \
+       w_cvar(id, sn, MO_NONE, radius) \
+       w_cvar(id, sn, MO_NONE, refire) \
+       w_prop(id, sn, float,  reloading_ammo, reload_ammo) \
+       w_prop(id, sn, float,  reloading_time, reload_time) \
+       w_prop(id, sn, float,  switchdelay_raise, switchdelay_raise) \
+       w_prop(id, sn, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(id, sn, string, weaponreplace, weaponreplace) \
+       w_prop(id, sn, float,  weaponstart, weaponstart) \
+       w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride)
 
 #ifdef SVQC
-TUBA_SETTINGS(tuba)
+TUBA_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
 .entity tuba_note;
 .float tuba_smoketime;
 .float tuba_instrument;
@@ -206,7 +211,7 @@ float Tuba_GetNote(entity pl, float hittype)
                note += 12;
        if(hittype & HITTYPE_SECONDARY)
                note += 7;
-       
+
        // we support two kinds of tubas, those tuned in Eb and those tuned in C
        // kind of tuba currently is player slot number, or team number if in
        // teamplay
@@ -221,7 +226,7 @@ float Tuba_GetNote(entity pl, float hittype)
                if(pl.clientcolors & 1)
                        note += 3;
        }
-       
+
        // total range of notes:
        //                       0
        //                 ***  ** ****
@@ -329,7 +334,7 @@ void W_Tuba_NoteOn(float hittype)
                }
        }
 
-       if not(self.tuba_note)
+       if (!self.tuba_note)
        {
                self.tuba_note = spawn();
                self.tuba_note.owner = self.tuba_note.realowner = self;
@@ -410,7 +415,7 @@ float w_tuba(float req)
                        precache_model ("models/weapons/h_akordeon.iqm");
                        precache_model ("models/weapons/v_kleinbottle.md3");
                        precache_model ("models/weapons/h_kleinbottle.iqm");
-                       WEP_SET_PROPS(TUBA_SETTINGS(tuba), WEP_TUBA)
+                       TUBA_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:
@@ -454,7 +459,7 @@ float w_tuba(float req)
                }
                case WR_CONFIG:
                {
-                       WEP_CONFIG_SETTINGS(TUBA_SETTINGS(tuba))
+                       TUBA_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
                        return TRUE;
                }
                case WR_SUICIDEMESSAGE: