From: TimePath Date: Mon, 28 Sep 2015 02:49:27 +0000 (+1000) Subject: Weapons: remove unused field w_simplemdl X-Git-Tag: xonotic-v0.8.2~1874^2~85 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=91a98939f9d6bb81888223e24ac18a748997cd5d;p=xonotic%2Fxonotic-data.pk3dir.git Weapons: remove unused field w_simplemdl --- diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 7bd56ede5..87f0a9e54 100644 --- 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 1a0b42de5..a5815b740 100644 --- 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 ae000e32c..bdbc23b7d 100644 --- 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 d6fefed7b..509cfb3f2 100644 --- 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 1faae844f..245ff30e6 100644 --- 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 f08ad101f..29157412c 100644 --- 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 0cc765f95..a83009cd5 100644 --- 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 7f6b01008..a63bffe5d 100644 --- 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 c3e9668ad..894c0ecec 100644 --- 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 baf9647eb..919eef592 100644 --- 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 52ce4da71..67a8f9656 100644 --- 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 338710609..e0a427b26 100644 --- 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 759361420..3bc22a34a 100644 --- 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 4c276d1ca..be51ebc07 100644 --- 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 6b6e6252a..a8ad17602 100644 --- 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 ef37d80ba..f4c388438 100644 --- 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 37e5c3cc4..a42f1e285 100644 --- 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 0ebbf0b90..ea197eb60 100644 --- 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 cc0da9418..abe70275d 100644 --- 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 b02022354..a0ae5900c 100644 --- 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 72276a646..ef7357754 100644 --- 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 c3dfad4af..558f0449e 100644 --- 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 6e2f7418d..965c6428a 100644 --- 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",