Add weapon image specification to REGISTER_WEAPON

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index 7fe270d2b550bf13cbadae488068d3c2767ba247..ed91cce1f65c031f1793b769e300eac1e506c837 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "hlac",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairhlac 0.7",
+/* wepimg    */ "weaponhlac",
 /* refname   */ "arc",
 /* wepname   */ _("Arc")
 );

diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc
index e7e2b3e8c96c7a0b685cb3189731da4d1d2e9ac0..963e54aaa981d25a22f2d4e639aac6bf357c3020 100644 (file)
--- a/qcsrc/common/weapons/w_blaster.qc
+++ b/qcsrc/common/weapons/w_blaster.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "laser",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairlaser 0.4",
+/* wepimg    */ "weaponlaser",
 /* refname   */ "blaster",
 /* wepname   */ _("Blaster")
 );

diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc
index c211ff48e24b3f06cce076a1cd72117772f39f27..68d742cefdd889ba7ed91f728d24865c24d9c4bb 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "crylink",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshaircrylink 0.4",
+/* wepimg    */ "weaponcrylink",
 /* refname   */ "crylink",
 /* wepname   */ _("Crylink")
 );

diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc
index 52f43062cbe6a4ed1cb89cb7e0f8b6670bc72738..13c7a46c8bc5e78a6b906c0d4bf7ff3747bade2e 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "rl",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairrocketlauncher 0.5875",
+/* wepimg    */ "weaponrocketlauncher",
 /* refname   */ "devastator",
 /* wepname   */ _("Devastator")
 );

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index 8826bd4a09f2c688d7408a336fcbe799a31d2823..c9104da373caa5b49434b830b1334e3e065f81da 100644 (file)
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "electro",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairelectro 0.5",
+/* wepimg    */ "weaponelectro",
 /* refname   */ "electro",
 /* wepname   */ _("Electro")
 );

diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc
index ab90c38b773ba36fd7f1a7315f5cb08ce1cf7887..d6f7129b4bd4a6b7f32d25f95d78efbcbc04f0db 100644 (file)
--- a/qcsrc/common/weapons/w_fireball.qc
+++ b/qcsrc/common/weapons/w_fireball.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "fireball",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairfireball",
+/* wepimg    */ "weaponfireball",
 /* refname   */ "fireball",
 /* wepname   */ _("Fireball")
 );

diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc
index 22d835e47e4f131c3f548ebb646ae052e4288f8a..981c7745fe8df291e3be10816c28841ff438e0bb 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "hagar",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairhagar 0.8",
+/* wepimg    */ "weaponhagar",
 /* refname   */ "hagar",
 /* wepname   */ _("Hagar")
 );

diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc
index 91aee6344c50b037817f362f612e1d492dc68c26..a154e96f01b28ef3a94aacef0dcecef3daa113eb 100644 (file)
--- a/qcsrc/common/weapons/w_hlac.qc
+++ b/qcsrc/common/weapons/w_hlac.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "hlac",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairhlac 0.6",
+/* wepimg    */ "weaponhlac",
 /* refname   */ "hlac",
 /* wepname   */ _("Heavy Laser Assault Cannon")
 );

diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc
index 9d47011e7adfa40d906dc5441d04e461055645ec..ca94ace96e1cfe6ea1bcb87d8200ef0ffc04c673 100644 (file)
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "hookgun",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairhook 0.5",
+/* wepimg    */ "weaponhook",
 /* refname   */ "hook",
 /* wepname   */ _("Grappling Hook")
 );

diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc
index 244c932e804aa251eff16730ebf63cb4eb344f69..949bfea8f872efd0b7163eb9771bc52cb3c08312 100644 (file)
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "uzi",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairuzi 0.6",
+/* wepimg    */ "weaponuzi",
 /* refname   */ "machinegun",
 /* wepname   */ _("Machine Gun")
 );

diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc
index 1443b4ff9b96d6958abfbfad086195e64a6f3c8d..f2dd04927861c7d031b556a8365800ad497c521b 100644 (file)
--- a/qcsrc/common/weapons/w_minelayer.qc
+++ b/qcsrc/common/weapons/w_minelayer.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "minelayer",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairminelayer 0.9",
+/* wepimg    */ "weaponminelayer",
 /* refname   */ "minelayer",
 /* wepname   */ _("Mine Layer")
 );

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index 16b50aa915d6757064abc198532d24183fd9cc7e..7f461598991290f328a66f9c36dffd10734d4cf9 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "gl",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairgrenadelauncher 0.7",
+/* wepimg    */ "weapongrenadelauncher",
 /* refname   */ "mortar",
 /* wepname   */ _("Mortar")
 );

diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc
index c127e0db8c916c8d0229a740166367b65f1d690d..945077601890432e796e7c55e4d5c8832f124ad7 100644 (file)
--- a/qcsrc/common/weapons/w_porto.qc
+++ b/qcsrc/common/weapons/w_porto.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "porto",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairporto 0.6",
+/* wepimg    */ "weaponporto",
 /* refname   */ "porto",
 /* wepname   */ _("Port-O-Launch")
 );

diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc
index 25e9cc4d2e30831602c9cff9d00f87597f89a96c..1836811ba3f98e5dac8f74f1e06c5a8b7037110a 100644 (file)
--- a/qcsrc/common/weapons/w_rifle.qc
+++ b/qcsrc/common/weapons/w_rifle.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "campingrifle",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairrifle 0.5",
+/* wepimg    */ "weaponrifle",
 /* refname   */ "rifle",
 /* wepname   */ _("Rifle")
 );

diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc
index b7ad7235d5cf358ae04f567e9232db632d176a99..deaa93ea4e7a321f2cb877ea93ae826b6fe361ca 100644 (file)
--- a/qcsrc/common/weapons/w_seeker.qc
+++ b/qcsrc/common/weapons/w_seeker.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "seeker",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairseeker 0.8",
+/* wepimg    */ "weaponseeker",
 /* refname   */ "seeker",
 /* wepname   */ _("T.A.G. Seeker")
 );

diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc
index 574e996831cce4698360f788a755b1c27ef7879a..9f477c350f0229a48ff9aa24785e212ce6ea241a 100644 (file)
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "shotgun",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairshotgun 0.7",
+/* wepimg    */ "weaponshotgun",
 /* refname   */ "shockwave",
 /* wepname   */ _("Shockwave")
 );

diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc
index f056078ec21e798e929490d02bc451a6f0af3179..2983f4db37f496b09cdd1df12f2843c13f4e04ec 100644 (file)
--- a/qcsrc/common/weapons/w_shotgun.qc
+++ b/qcsrc/common/weapons/w_shotgun.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "shotgun",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairshotgun 0.65",
+/* wepimg    */ "weaponshotgun",
 /* refname   */ "shotgun",
 /* wepname   */ _("Shotgun")
 );

diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc
index bb57ce9b68c9f649f309327b894dd15fa5f19130..238c561ac3f8f0d15b6a7a77c22964215ed29152 100644 (file)
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "tuba",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairtuba",
+/* wepimg    */ "weapontuba",
 /* refname   */ "tuba",
 /* xgettext:no-c-format */
 /* wepname   */ _("@!#%'n Tuba")

diff --git a/qcsrc/common/weapons/w_vaporizer.qc b/qcsrc/common/weapons/w_vaporizer.qc
index e00c180c71aff9f84349d3b9a47f1f200fbac4df..674ecc7eefa09ca5c9764552049ff9a10c15a95b 100644 (file)
--- a/qcsrc/common/weapons/w_vaporizer.qc
+++ b/qcsrc/common/weapons/w_vaporizer.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "minstanex",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairminstanex 0.4",
+/* wepimg    */ "weaponminstanex",
 /* refname   */ "vaporizer",
 /* wepname   */ _("Vaporizer")
 );

diff --git a/qcsrc/common/weapons/w_vortex.qc b/qcsrc/common/weapons/w_vortex.qc
index 5b3a6575480ec765bdbc4570ad57d86190ca2a1f..9f8c55cd932e23c7dfff921bf9237150b2c24694 100644 (file)
--- a/qcsrc/common/weapons/w_vortex.qc
+++ b/qcsrc/common/weapons/w_vortex.qc
@@ -10,6 +10,7 @@ REGISTER_WEAPON(
 /* modelname */ "nex",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairnex 0.65",
+/* wepimg    */ "weaponnex",
 /* refname   */ "vortex",
 /* wepname   */ _("Vortex")
 );

diff --git a/qcsrc/common/weapons/weapons.qc b/qcsrc/common/weapons/weapons.qc
index 21dc088e45fca9164e67a5438cb24be472432aef..425fe5f64aa73a1d03c6a093922741873a1dfb1b 100644 (file)
--- a/qcsrc/common/weapons/weapons.qc
+++ b/qcsrc/common/weapons/weapons.qc
@@ -86,6 +86,7 @@ void register_weapon(
        string modelname,
        string simplemdl,
        string crosshair,
+       string wepimg,
        string refname,
        string wepname)
 {
@@ -107,6 +108,7 @@ void register_weapon(
        e.w_crosshair = strzone(car(crosshair));
        string s = cdr(crosshair);
        e.w_crosshair_size = ((s != "") ? stof(s) : 1); // so that we can scale the crosshair from code (for compat)
+       e.model2 = strzone(wepimg);
        e.netname = refname;
        e.message = wepname;
 
@@ -137,6 +139,7 @@ void register_weapons_done()
 
        dummy_weapon_info.w_crosshair = "gfx/crosshair1";
        dummy_weapon_info.w_crosshair_size = 1;
+       dummy_weapon_info.model2 = "";
 
        float i;
        weaponorder_byid = "";

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index 31f79dafd65b8a2e6c78d0da13c3a105ab79d5a6..ba2e8a15e1cd7d63f23fd975759e64100eaf78b7 100644 (file)
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -141,6 +141,7 @@ void register_weapon(
        string modelname,
        string simplemdl,
        string crosshair,
+       string wepimg,
        string refname,
        string wepname);
 
@@ -162,12 +163,13 @@ void register_weapons_done();
 .string w_simplemdl;        // M: simplemdl // simpleitems weapon model/image
 .string w_crosshair;        // M: crosshair // per-weapon crosshair: "CrosshairImage Size"
 .float w_crosshair_size;    // A: crosshair // per-weapon crosshair size (argument two of "crosshair" field)
+.string model2;             // M: wepimg    // "weaponfoobar" side view image file of weapon // WEAPONTODO: Move out of skin files, move to common files
 .string netname;            // M: refname   // reference name name
 .string message;            // M: wepname   // human readable name
 
 
 // note: the fabs call is just there to hide "if result is constant" warning
-#define REGISTER_WEAPON_2(id,bit,function,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,refname,wepname) \
+#define REGISTER_WEAPON_2(id,bit,function,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,wepimg,refname,wepname) \
        float id; \
        WepSet bit; \
        float function(float); \
@@ -179,15 +181,15 @@ void register_weapons_done();
                if((flags) & WEP_FLAG_SUPERWEAPON) \
                        WEPSET_SUPERWEAPONS |= bit; \
                ++WEP_COUNT; \
-               register_weapon(id,bit,function,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,refname,wepname); \
+               register_weapon(id,bit,function,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,wepimg,refname,wepname); \
        } \
        ACCUMULATE_FUNCTION(RegisterWeapons, RegisterWeapons_##id)
 #ifdef MENUQC
-#define REGISTER_WEAPON(id,function,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,refname,wepname) \
-       REGISTER_WEAPON_2(WEP_##id,WEPSET_##id,w_null,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,refname,wepname)
+#define REGISTER_WEAPON(id,function,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,wepimg,refname,wepname) \
+       REGISTER_WEAPON_2(WEP_##id,WEPSET_##id,w_null,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,wepimg,refname,wepname)
 #else
-#define REGISTER_WEAPON(id,function,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,refname,wepname) \
-       REGISTER_WEAPON_2(WEP_##id,WEPSET_##id,function,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,refname,wepname)
+#define REGISTER_WEAPON(id,function,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,wepimg,refname,wepname) \
+       REGISTER_WEAPON_2(WEP_##id,WEPSET_##id,function,ammotype,impulse,flags,rating,color,modelname,simplemdl,crosshair,wepimg,refname,wepname)
 #endif
 
 #include "all.qh"