Weapons: remove unused field w_simplemdl

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 7bd56ede53132133753450712676d3aa139f867e..87f0a9e54c5a1768b0c7ff0215aea784337005ae 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -214,8 +214,6 @@ CLASS(Weapon, Object)
     ATTRIB(Weapon, mdl, string, "");
     /** M: model MDL_id_ITEM */
     ATTRIB(Weapon, m_model, entity, NULL);
-    /** M: simplemdl : simpleitems weapon model/image */
-    ATTRIB(Weapon, w_simplemdl, string, "foobar");
     /** M: crosshair : per-weapon crosshair: "CrosshairImage Size" */
     ATTRIB(Weapon, w_crosshair, string, "gfx/crosshair1");
     /** A: crosshair : per-weapon crosshair size (argument two of "crosshair" field) */
@@ -240,7 +238,6 @@ CLASS(Weapon, Object)
                vector clr,
                string modelname,
                entity m,
-               string simplemdl,
                string crosshair,
                string wepimg,
                string refname,
@@ -255,7 +252,6 @@ CLASS(Weapon, Object)
                this.wpcolor = clr;
                this.mdl = modelname;
                this.m_model = m;
-               this.w_simplemdl = strzone(simplemdl); // simpleitems weapon model/image
                this.w_crosshair = strzone(car(crosshair));
                string s = cdr(crosshair);
                this.w_crosshair_size = ((s != "") ? stof(s) : 1); // so that we can scale the crosshair from code (for compat)
@@ -293,16 +289,16 @@ entity dummy_weapon_info;
        } \
        REGISTER_INIT(WEP, id)
 
-#define _REGISTER_WEAPON(id, function, ammotype, impulse, flags, rating, color, modelname, mdl, simplemdl, crosshair, wepimg, refname, wepname) \
-       REGISTER_WEAPON_2(id, NEW(Weapon, function, ammotype, impulse, flags, rating, color, modelname, mdl, simplemdl, crosshair, wepimg, refname, wepname))
+#define _REGISTER_WEAPON(id, function, ammotype, impulse, flags, rating, color, modelname, mdl, crosshair, wepimg, refname, wepname) \
+       REGISTER_WEAPON_2(id, NEW(Weapon, function, ammotype, impulse, flags, rating, color, modelname, mdl, crosshair, wepimg, refname, wepname))
 
 #ifndef MENUQC
-       #define REGISTER_WEAPON_14(id, function, ammotype, impulse, flags, rating, color, modelname, mdl, simplemdl, crosshair, wepimg, refname, wepname) \
+       #define REGISTER_WEAPON_13(id, function, ammotype, impulse, flags, rating, color, modelname, mdl, crosshair, wepimg, refname, wepname) \
        bool function(entity this, int); \
-       _REGISTER_WEAPON(id, function, ammotype, impulse, flags, rating, color, modelname, mdl, simplemdl, crosshair, wepimg, refname, wepname)
+       _REGISTER_WEAPON(id, function, ammotype, impulse, flags, rating, color, modelname, mdl, crosshair, wepimg, refname, wepname)
 #else
-       #define REGISTER_WEAPON_14(id, function, ammotype, impulse, flags, rating, color, modelname, mdl, simplemdl, crosshair, wepimg, refname, wepname) \
-               _REGISTER_WEAPON(id, w_new,   ammotype, impulse, flags, rating, color, modelname, NULL, simplemdl, crosshair, wepimg, refname, wepname)
+       #define REGISTER_WEAPON_13(id, function, ammotype, impulse, flags, rating, color, modelname, mdl, crosshair, wepimg, refname, wepname) \
+               _REGISTER_WEAPON(id, w_new,   ammotype, impulse, flags, rating, color, modelname, NULL, crosshair, wepimg, refname, wepname)
 #endif
 
 #include "all.inc"

diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index 1a0b42de56fa66e582abb68af674952264957ec5..a5815b7400f35e80068f2b579238fe1fc4160d64 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '1 1 1',
 /* modelname */ "arc",
 /* model     */ MDL_ARC_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairhlac 0.7",
 /* wepimg    */ "weaponarc",
 /* refname   */ "arc",

diff --git a/qcsrc/common/weapons/weapon/blaster.qc b/qcsrc/common/weapons/weapon/blaster.qc
index ae000e32ca517d1558195eaaaa7e693e6764e19c..bdbc23b7d658e626a6089fbcfccce0a875dc6ec4 100644 (file)
--- a/qcsrc/common/weapons/weapon/blaster.qc
+++ b/qcsrc/common/weapons/weapon/blaster.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '1 0.5 0.5',
 /* modelname */ "laser",
 /* model     */ MDL_BLASTER_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairlaser 0.5",
 /* wepimg    */ "weaponlaser",
 /* refname   */ "blaster",

diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc
index d6fefed7b723cfbbedb82e55a2309516ea80f42c..509cfb3f20963832566b11536f7ce67a971e5a8e 100644 (file)
--- a/qcsrc/common/weapons/weapon/crylink.qc
+++ b/qcsrc/common/weapons/weapon/crylink.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '1 0.5 1',
 /* modelname */ "crylink",
 /* model     */ MDL_CRYLINK_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshaircrylink 0.5",
 /* wepimg    */ "weaponcrylink",
 /* refname   */ "crylink",

diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc
index 1faae844f9ad37240f2fef6b15243d38a9484c2d..245ff30e664fb51d14a4028e1773b0f9becb1307 100644 (file)
--- a/qcsrc/common/weapons/weapon/devastator.qc
+++ b/qcsrc/common/weapons/weapon/devastator.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '1 1 0',
 /* modelname */ "rl",
 /* model     */ MDL_DEVASTATOR_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairrocketlauncher 0.7",
 /* wepimg    */ "weaponrocketlauncher",
 /* refname   */ "devastator",

diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc
index f08ad101f1e103631d13040b4703b4cfb1b59220..29157412c1afcdb5259d30f2435ada859310a5f8 100644 (file)
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0 0.5 1',
 /* modelname */ "electro",
 /* model     */ MDL_ELECTRO_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairelectro 0.6",
 /* wepimg    */ "weaponelectro",
 /* refname   */ "electro",

diff --git a/qcsrc/common/weapons/weapon/fireball.qc b/qcsrc/common/weapons/weapon/fireball.qc
index 0cc765f955da106e7a36731059d16878a674884c..a83009cd5dcc4058ec578b26eb49bc04c003f9c7 100644 (file)
--- a/qcsrc/common/weapons/weapon/fireball.qc
+++ b/qcsrc/common/weapons/weapon/fireball.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '1 0.5 0',
 /* modelname */ "fireball",
 /* model     */ MDL_FIREBALL_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairfireball",
 /* wepimg    */ "weaponfireball",
 /* refname   */ "fireball",

diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc
index 7f6b01008788048d12302926fffdf8e04fc759c7..a63bffe5d76687b227ea08ff4ea2d076e8cd0f5f 100644 (file)
--- a/qcsrc/common/weapons/weapon/hagar.qc
+++ b/qcsrc/common/weapons/weapon/hagar.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '1 1 0.5',
 /* modelname */ "hagar",
 /* model     */ MDL_HAGAR_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairhagar 0.8",
 /* wepimg    */ "weaponhagar",
 /* refname   */ "hagar",

diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc
index c3e9668addd0b38bc61f28168638cda7f69377f7..894c0ecec66d64ca3e7a3a102d7f2612fb37955f 100644 (file)
--- a/qcsrc/common/weapons/weapon/hlac.qc
+++ b/qcsrc/common/weapons/weapon/hlac.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0 1 0',
 /* modelname */ "hlac",
 /* model     */ MDL_HLAC_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairhlac 0.6",
 /* wepimg    */ "weaponhlac",
 /* refname   */ "hlac",

diff --git a/qcsrc/common/weapons/weapon/hmg.qc b/qcsrc/common/weapons/weapon/hmg.qc
index baf9647ebe718852c6ab9df929c63fd63578432c..919eef592d0d9b24c2442a66f441f98bb4954d08 100644 (file)
--- a/qcsrc/common/weapons/weapon/hmg.qc
+++ b/qcsrc/common/weapons/weapon/hmg.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0.5 0.5 0',
 /* modelname */ "ok_hmg",
 /* model     */ MDL_HMG_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairuzi 0.6",
 /* wepimg    */ "weaponhmg",
 /* refname   */ "hmg",

diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc
index 52ce4da71a5def5b79770898dac611348eee510d..67a8f9656fbef87c71327c3b6b9054048ed19e78 100644 (file)
--- a/qcsrc/common/weapons/weapon/hook.qc
+++ b/qcsrc/common/weapons/weapon/hook.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0 0.5 0',
 /* modelname */ "hookgun",
 /* model     */ MDL_HOOK_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairhook 0.5",
 /* wepimg    */ "weaponhook",
 /* refname   */ "hook",

diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc
index 33871060992d70e25b6769307d7127c25c97f52c..e0a427b2685df54de88337198d7c36366c5a4c81 100644 (file)
--- a/qcsrc/common/weapons/weapon/machinegun.qc
+++ b/qcsrc/common/weapons/weapon/machinegun.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '1 1 0',
 /* modelname */ "uzi",
 /* model     */ MDL_MACHINEGUN_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairuzi 0.6",
 /* wepimg    */ "weaponuzi",
 /* refname   */ "machinegun",

diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc
index 759361420f641250cf035cd6421033f357ed3a91..3bc22a34aceea4e1169cf70a7677bdf2d311d5bf 100644 (file)
--- a/qcsrc/common/weapons/weapon/minelayer.qc
+++ b/qcsrc/common/weapons/weapon/minelayer.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0.75 1 0',
 /* modelname */ "minelayer",
 /* model     */ MDL_MINELAYER_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairminelayer 0.9",
 /* wepimg    */ "weaponminelayer",
 /* refname   */ "minelayer",

diff --git a/qcsrc/common/weapons/weapon/mortar.qc b/qcsrc/common/weapons/weapon/mortar.qc
index 4c276d1caa0593fbdd8c80459b296d049df11bd2..be51ebc076fd5dea7c0290fb2a71dd52ef3c1dec 100644 (file)
--- a/qcsrc/common/weapons/weapon/mortar.qc
+++ b/qcsrc/common/weapons/weapon/mortar.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '1 0 0',
 /* modelname */ "gl",
 /* model     */ MDL_MORTAR_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairgrenadelauncher 0.7",
 /* wepimg    */ "weapongrenadelauncher",
 /* refname   */ "mortar",

diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc
index 6b6e6252a2b89bb261d7615a98e22fe87448546a..a8ad17602163f18ccc30717528ac835060cdc606 100644 (file)
--- a/qcsrc/common/weapons/weapon/porto.qc
+++ b/qcsrc/common/weapons/weapon/porto.qc
@@ -9,7 +9,6 @@ CLASS(PortoLaunch, Weapon)
 #ifndef MENUQC
 /* model     */ ATTRIB(PortoLaunch, m_model, Model, MDL_PORTO_ITEM);
 #endif
-/* simplemdl */ ATTRIB(PortoLaunch, w_simplemdl, string, "foobar");
 /* crosshair */ ATTRIB(PortoLaunch, w_crosshair, string, "gfx/crosshairporto");
 /* crosshair */ ATTRIB(PortoLaunch, w_crosshair_size, float, 0.6);
 /* wepimg    */ ATTRIB(PortoLaunch, model2, string, "weaponporto");

diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc
index ef37d80ba912368a783eb92b9480e2ff80e9436d..f4c388438777d1ab256450afd1b0b05a8c9b8c91 100644 (file)
--- a/qcsrc/common/weapons/weapon/rifle.qc
+++ b/qcsrc/common/weapons/weapon/rifle.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0.5 1 0',
 /* modelname */ "campingrifle",
 /* model     */ MDL_RIFLE_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairrifle 0.6",
 /* wepimg    */ "weaponrifle",
 /* refname   */ "rifle",

diff --git a/qcsrc/common/weapons/weapon/rpc.qc b/qcsrc/common/weapons/weapon/rpc.qc
index 37e5c3cc41a396312393623d5c2b9828993cb31e..a42f1e285f5839a10a70dc224a407804b6af8359 100644 (file)
--- a/qcsrc/common/weapons/weapon/rpc.qc
+++ b/qcsrc/common/weapons/weapon/rpc.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0.5 0.5 0',
 /* modelname */ "ok_rl",
 /* model     */ MDL_RPC_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairrocketlauncher 0.7",
 /* wepimg    */ "weaponrpc",
 /* refname   */ "rpc",

diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc
index 0ebbf0b90ff8f1a7a5d4ee51c7c78daaaf55f3c9..ea197eb6062166330a3aef5047f3c1083dfaa2c6 100644 (file)
--- a/qcsrc/common/weapons/weapon/seeker.qc
+++ b/qcsrc/common/weapons/weapon/seeker.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0.5 1 0',
 /* modelname */ "seeker",
 /* model     */ MDL_SEEKER_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairseeker 0.8",
 /* wepimg    */ "weaponseeker",
 /* refname   */ "seeker",

diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc
index cc0da9418f3bf47d364338d0a1a7b5fa959760ba..abe70275dcc061b2adb929318a118b65f84e041c 100644 (file)
--- a/qcsrc/common/weapons/weapon/shockwave.qc
+++ b/qcsrc/common/weapons/weapon/shockwave.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0.5 0.25 0',
 /* modelname */ "shotgun",
 /* model     */ MDL_SHOCKWAVE_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairshotgun 0.7",
 /* wepimg    */ "weaponshotgun",
 /* refname   */ "shockwave",

diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc
index b020223547db7d9316903fff506ea2f5e6f2a15c..a0ae5900cb6cf696206ff30a40bf3fb1a6be8423 100644 (file)
--- a/qcsrc/common/weapons/weapon/shotgun.qc
+++ b/qcsrc/common/weapons/weapon/shotgun.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0.5 0.25 0',
 /* modelname */ "shotgun",
 /* model     */ MDL_SHOTGUN_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairshotgun 0.65",
 /* wepimg    */ "weaponshotgun",
 /* refname   */ "shotgun",

diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc
index 72276a64699892f566e4d36fba2eec17435b55a4..ef73577549f14f1753d13b87cc4407e82975685f 100644 (file)
--- a/qcsrc/common/weapons/weapon/tuba.qc
+++ b/qcsrc/common/weapons/weapon/tuba.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0 1 0',
 /* modelname */ "tuba",
 /* model     */ MDL_TUBA_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairtuba",
 /* wepimg    */ "weapontuba",
 /* refname   */ "tuba",

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc
index c3dfad4af42d4dbfdb6cba8a50c9d4740ec9c200..558f0449eec1588193b5fb769c0d8032493e23be 100644 (file)
--- a/qcsrc/common/weapons/weapon/vaporizer.qc
+++ b/qcsrc/common/weapons/weapon/vaporizer.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0.5 1 1',
 /* modelname */ "minstanex",
 /* model     */ MDL_VAPORIZER_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairminstanex 0.6",
 /* wepimg    */ "weaponminstanex",
 /* refname   */ "vaporizer",

diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index 6e2f7418da38a7012cf65c39b668e174e64bd66c..965c6428a6fe8cc321c172b71c36354195ccc4f1 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -9,7 +9,6 @@ REGISTER_WEAPON(
 /* color     */ '0.5 1 1',
 /* modelname */ "nex",
 /* model     */ MDL_VORTEX_ITEM,
-/* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairnex 0.65",
 /* wepimg    */ "weaponnex",
 /* refname   */ "vortex",