From: Samual Lenks <samual@xonotic.org>
Date: Fri, 3 Jan 2014 16:48:19 +0000 (-0500)
Subject: Add weapon image specification to REGISTER_WEAPON
X-Git-Tag: xonotic-v0.8.0~152^2~144
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=014e27ddc7d207bd3ffe09a5d966f969e4a50712;p=xonotic%2Fxonotic-data.pk3dir.git

Add weapon image specification to REGISTER_WEAPON
---

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index 7fe270d2b5..ed91cce1f6 100644
--- 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 e7e2b3e8c9..963e54aaa9 100644
--- 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 c211ff48e2..68d742cefd 100644
--- 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 52f43062cb..13c7a46c8b 100644
--- 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 8826bd4a09..c9104da373 100644
--- 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 ab90c38b77..d6f7129b4b 100644
--- 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 22d835e47e..981c7745fe 100644
--- 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 91aee6344c..a154e96f01 100644
--- 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 9d47011e7a..ca94ace96e 100644
--- 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 244c932e80..949bfea8f8 100644
--- 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 1443b4ff9b..f2dd049278 100644
--- 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 16b50aa915..7f46159899 100644
--- 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 c127e0db8c..9450776018 100644
--- 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 25e9cc4d2e..1836811ba3 100644
--- 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 b7ad7235d5..deaa93ea4e 100644
--- 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 574e996831..9f477c350f 100644
--- 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 f056078ec2..2983f4db37 100644
--- 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 bb57ce9b68..238c561ac3 100644
--- 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 e00c180c71..674ecc7eef 100644
--- 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 5b3a657548..9f8c55cd93 100644
--- 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 21dc088e45..425fe5f64a 100644
--- 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 31f79dafd6..ba2e8a15e1 100644
--- 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"