From 5c310847e6bc220259772e180f63c2498a222d46 Mon Sep 17 00:00:00 2001 From: otta8634 Date: Tue, 7 Jan 2025 21:49:34 +0800 Subject: [PATCH] Rename .wpcolor to .m_color Weapons didn't simultaneously use .m_color so this shouldn't introduce any regressions. Removes an unnecessary entity field, and helps make the coloring of things more standardized. --- qcsrc/client/hud/crosshair.qc | 2 +- qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc | 2 +- qcsrc/common/mutators/mutator/overkill/okhmg.qh | 2 +- qcsrc/common/mutators/mutator/overkill/okmachinegun.qh | 2 +- qcsrc/common/mutators/mutator/overkill/oknex.qh | 2 +- qcsrc/common/mutators/mutator/overkill/okrpc.qh | 2 +- qcsrc/common/mutators/mutator/overkill/okshotgun.qh | 2 +- qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc | 2 +- qcsrc/common/weapons/weapon.qh | 2 +- qcsrc/common/weapons/weapon/arc.qh | 2 +- qcsrc/common/weapons/weapon/blaster.qh | 2 +- qcsrc/common/weapons/weapon/crylink.qh | 2 +- qcsrc/common/weapons/weapon/devastator.qh | 2 +- qcsrc/common/weapons/weapon/electro.qh | 2 +- qcsrc/common/weapons/weapon/fireball.qh | 2 +- qcsrc/common/weapons/weapon/hagar.qh | 2 +- qcsrc/common/weapons/weapon/hlac.qh | 2 +- qcsrc/common/weapons/weapon/hook.qh | 2 +- qcsrc/common/weapons/weapon/machinegun.qh | 2 +- qcsrc/common/weapons/weapon/minelayer.qh | 2 +- qcsrc/common/weapons/weapon/mortar.qh | 2 +- qcsrc/common/weapons/weapon/porto.qh | 2 +- qcsrc/common/weapons/weapon/rifle.qh | 2 +- qcsrc/common/weapons/weapon/seeker.qh | 2 +- qcsrc/common/weapons/weapon/shockwave.qh | 2 +- qcsrc/common/weapons/weapon/shotgun.qh | 2 +- qcsrc/common/weapons/weapon/tuba.qh | 2 +- qcsrc/common/weapons/weapon/vaporizer.qh | 2 +- qcsrc/common/weapons/weapon/vortex.qh | 2 +- qcsrc/server/weapons/spawning.qc | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/qcsrc/client/hud/crosshair.qc b/qcsrc/client/hud/crosshair.qc index 1d2bc6085..ec83736e8 100644 --- a/qcsrc/client/hud/crosshair.qc +++ b/qcsrc/client/hud/crosshair.qc @@ -179,7 +179,7 @@ vector crosshair_getcolor(entity this, float health_stat) { if(this != WEP_Null && hud == HUD_NORMAL) { - wcross_color = this.wpcolor; + wcross_color = this.m_color; break; } else { goto normalcolor; } diff --git a/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc index c49ebb7e5..2bd6fba28 100644 --- a/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc +++ b/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc @@ -85,7 +85,7 @@ CLASS(DamageText, Object) if (autocvar_cl_damagetext_color_per_weapon) { Weapon w = DEATH_WEAPONOF(this.m_deathtype); - if (w != WEP_Null) rgb = w.wpcolor; + if (w != WEP_Null) rgb = w.m_color; } vector drawfontscale_save = drawfontscale; diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qh b/qcsrc/common/mutators/mutator/overkill/okhmg.qh index dc812be31..5393fa933 100644 --- a/qcsrc/common/mutators/mutator/overkill/okhmg.qh +++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qh @@ -8,7 +8,7 @@ CLASS(OverkillHeavyMachineGun, Weapon) /* impulse */ ATTRIB(OverkillHeavyMachineGun, impulse, int, 3); /* flags */ ATTRIB(OverkillHeavyMachineGun, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_SUPERWEAPON | WEP_FLAG_PENETRATEWALLS); /* rating */ ATTRIB(OverkillHeavyMachineGun, bot_pickupbasevalue, float, 10000); -/* color */ ATTRIB(OverkillHeavyMachineGun, wpcolor, vector, '0.5 0.5 0'); +/* color */ ATTRIB(OverkillHeavyMachineGun, m_color, vector, '0.5 0.5 0'); /* modelname */ ATTRIB(OverkillHeavyMachineGun, mdl, string, "ok_hmg"); #ifdef GAMEQC /* model */ ATTRIB(OverkillHeavyMachineGun, m_model, Model, MDL_HMG_ITEM); diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh index 742bc6076..367afca7c 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh @@ -6,7 +6,7 @@ CLASS(OverkillMachineGun, Weapon) /* impulse */ ATTRIB(OverkillMachineGun, impulse, int, 3); /* flags */ ATTRIB(OverkillMachineGun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillMachineGun, bot_pickupbasevalue, float, 7000); -/* color */ ATTRIB(OverkillMachineGun, wpcolor, vector, '1 1 0'); +/* color */ ATTRIB(OverkillMachineGun, m_color, vector, '1 1 0'); /* modelname */ ATTRIB(OverkillMachineGun, mdl, string, "ok_mg"); #ifdef GAMEQC /* model */ ATTRIB(OverkillMachineGun, m_model, Model, MDL_OK_MG_ITEM); diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh index 120f6d66d..f90d3292a 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qh +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh @@ -6,7 +6,7 @@ CLASS(OverkillNex, Weapon) /* impulse */ ATTRIB(OverkillNex, impulse, int, 7); /* flags */ ATTRIB(OverkillNex, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillNex, bot_pickupbasevalue, float, 8000); -/* color */ ATTRIB(OverkillNex, wpcolor, vector, '0.5 1 1'); +/* color */ ATTRIB(OverkillNex, m_color, vector, '0.5 1 1'); /* modelname */ ATTRIB(OverkillNex, mdl, string, "ok_sniper"); #ifdef GAMEQC /* model */ ATTRIB(OverkillNex, m_model, Model, MDL_OK_SNIPER_ITEM); diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qh b/qcsrc/common/mutators/mutator/overkill/okrpc.qh index 2f4388d96..7a3415156 100644 --- a/qcsrc/common/mutators/mutator/overkill/okrpc.qh +++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qh @@ -8,7 +8,7 @@ CLASS(OverkillRocketPropelledChainsaw, Weapon) /* impulse */ ATTRIB(OverkillRocketPropelledChainsaw, impulse, int, 9); /* flags */ ATTRIB(OverkillRocketPropelledChainsaw, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON); /* rating */ ATTRIB(OverkillRocketPropelledChainsaw, bot_pickupbasevalue, float, 10000); -/* color */ ATTRIB(OverkillRocketPropelledChainsaw, wpcolor, vector, '0.5 0.5 0'); +/* color */ ATTRIB(OverkillRocketPropelledChainsaw, m_color, vector, '0.5 0.5 0'); /* modelname */ ATTRIB(OverkillRocketPropelledChainsaw, mdl, string, "ok_rl"); #ifdef GAMEQC /* model */ ATTRIB(OverkillRocketPropelledChainsaw, m_model, Model, MDL_RPC_ITEM); diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh index 7dd68a731..08cff024a 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh @@ -6,7 +6,7 @@ CLASS(OverkillShotgun, Weapon) /* impulse */ ATTRIB(OverkillShotgun, impulse, int, 2); /* flags */ ATTRIB(OverkillShotgun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillShotgun, bot_pickupbasevalue, float, 6000); -/* color */ ATTRIB(OverkillShotgun, wpcolor, vector, '0.5 0.25 0'); +/* color */ ATTRIB(OverkillShotgun, m_color, vector, '0.5 0.25 0'); /* modelname */ ATTRIB(OverkillShotgun, mdl, string, "ok_shotgun"); #ifdef GAMEQC /* model */ ATTRIB(OverkillShotgun, m_model, Model, MDL_OK_SHOTGUN_ITEM); diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc index 0625f412e..c9d4d9a73 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc @@ -221,7 +221,7 @@ float spritelookupblinkvalue(entity this, string s) vector spritelookupcolor(entity this, string s, vector def) { - if (s == WP_Weapon.netname || s == RADARICON_Weapon.netname) return REGISTRY_GET(Weapons, this.wp_extra).wpcolor; + if (s == WP_Weapon.netname || s == RADARICON_Weapon.netname) return REGISTRY_GET(Weapons, this.wp_extra).m_color; if (s == WP_Item.netname || s == RADARICON_Item.netname) return REGISTRY_GET(Items, this.wp_extra).m_color; if (MUTATOR_CALLHOOK(WP_Format, this, s)) { diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh index 38902ea7e..020736ea8 100644 --- a/qcsrc/common/weapons/weapon.qh +++ b/qcsrc/common/weapons/weapon.qh @@ -53,7 +53,7 @@ CLASS(Weapon, Object) /** M: rating : bot weapon priority */ ATTRIB(Weapon, bot_pickupbasevalue, float, 0); /** M: color : waypointsprite color */ - ATTRIB(Weapon, wpcolor, vector, '0 0 0'); + ATTRIB(Weapon, m_color, vector, '0 0 0'); /** M: modelname : name of model (without g_ v_ or h_ prefixes) */ ATTRIB(Weapon, mdl, string, ""); #ifdef GAMEQC diff --git a/qcsrc/common/weapons/weapon/arc.qh b/qcsrc/common/weapons/weapon/arc.qh index caf874eb9..31b829c59 100644 --- a/qcsrc/common/weapons/weapon/arc.qh +++ b/qcsrc/common/weapons/weapon/arc.qh @@ -6,7 +6,7 @@ CLASS(Arc, Weapon) /* impulse */ ATTRIB(Arc, impulse, int, 3); /* flags */ ATTRIB(Arc, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_TYPE_HITSCAN); /* rating */ ATTRIB(Arc, bot_pickupbasevalue, float, 8000); -/* color */ ATTRIB(Arc, wpcolor, vector, '1 1 1'); +/* color */ ATTRIB(Arc, m_color, vector, '1 1 1'); /* modelname */ ATTRIB(Arc, mdl, string, "arc"); #ifdef GAMEQC /* model */ ATTRIB(Arc, m_model, Model, MDL_ARC_ITEM); diff --git a/qcsrc/common/weapons/weapon/blaster.qh b/qcsrc/common/weapons/weapon/blaster.qh index 27709310e..a06652301 100644 --- a/qcsrc/common/weapons/weapon/blaster.qh +++ b/qcsrc/common/weapons/weapon/blaster.qh @@ -6,7 +6,7 @@ CLASS(Blaster, Weapon) /* impulse */ ATTRIB(Blaster, impulse, int, 1); /* flags */ ATTRIB(Blaster, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Blaster, bot_pickupbasevalue, float, 0); -/* color */ ATTRIB(Blaster, wpcolor, vector, '1 0.5 0.5'); +/* color */ ATTRIB(Blaster, m_color, vector, '1 0.5 0.5'); /* modelname */ ATTRIB(Blaster, mdl, string, "laser"); #ifdef GAMEQC /* model */ ATTRIB(Blaster, m_model, Model, MDL_BLASTER_ITEM); diff --git a/qcsrc/common/weapons/weapon/crylink.qh b/qcsrc/common/weapons/weapon/crylink.qh index 15b46ba72..17f2b193c 100644 --- a/qcsrc/common/weapons/weapon/crylink.qh +++ b/qcsrc/common/weapons/weapon/crylink.qh @@ -6,7 +6,7 @@ CLASS(Crylink, Weapon) /* impulse */ ATTRIB(Crylink, impulse, int, 6); /* flags */ ATTRIB(Crylink, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_CANCLIMB); /* rating */ ATTRIB(Crylink, bot_pickupbasevalue, float, 6000); -/* color */ ATTRIB(Crylink, wpcolor, vector, '1 0.5 1'); +/* color */ ATTRIB(Crylink, m_color, vector, '1 0.5 1'); /* modelname */ ATTRIB(Crylink, mdl, string, "crylink"); #ifdef GAMEQC /* model */ ATTRIB(Crylink, m_model, Model, MDL_CRYLINK_ITEM); diff --git a/qcsrc/common/weapons/weapon/devastator.qh b/qcsrc/common/weapons/weapon/devastator.qh index 1d3261f42..710e97421 100644 --- a/qcsrc/common/weapons/weapon/devastator.qh +++ b/qcsrc/common/weapons/weapon/devastator.qh @@ -6,7 +6,7 @@ CLASS(Devastator, Weapon) /* impulse */ ATTRIB(Devastator, impulse, int, 9); /* flags */ ATTRIB(Devastator, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Devastator, bot_pickupbasevalue, float, 8000); -/* color */ ATTRIB(Devastator, wpcolor, vector, '1 1 0'); +/* color */ ATTRIB(Devastator, m_color, vector, '1 1 0'); /* modelname */ ATTRIB(Devastator, mdl, string, "rl"); #ifdef GAMEQC /* model */ ATTRIB(Devastator, m_model, Model, MDL_DEVASTATOR_ITEM); diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh index e7df4e039..a8f22029a 100644 --- a/qcsrc/common/weapons/weapon/electro.qh +++ b/qcsrc/common/weapons/weapon/electro.qh @@ -6,7 +6,7 @@ CLASS(Electro, Weapon) /* impulse */ ATTRIB(Electro, impulse, int, 5); /* flags */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Electro, bot_pickupbasevalue, float, 5000); -/* color */ ATTRIB(Electro, wpcolor, vector, '0 0.5 1'); +/* color */ ATTRIB(Electro, m_color, vector, '0 0.5 1'); /* modelname */ ATTRIB(Electro, mdl, string, "electro"); #ifdef GAMEQC /* model */ ATTRIB(Electro, m_model, Model, MDL_ELECTRO_ITEM); diff --git a/qcsrc/common/weapons/weapon/fireball.qh b/qcsrc/common/weapons/weapon/fireball.qh index 3ce41d932..af09a666c 100644 --- a/qcsrc/common/weapons/weapon/fireball.qh +++ b/qcsrc/common/weapons/weapon/fireball.qh @@ -6,7 +6,7 @@ CLASS(Fireball, Weapon) /* impulse */ ATTRIB(Fireball, impulse, int, 9); /* flags */ ATTRIB(Fireball, spawnflags, int, WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH | WEP_FLAG_NODUAL); /* rating */ ATTRIB(Fireball, bot_pickupbasevalue, float, 5000); -/* color */ ATTRIB(Fireball, wpcolor, vector, '1 0.5 0'); +/* color */ ATTRIB(Fireball, m_color, vector, '1 0.5 0'); /* modelname */ ATTRIB(Fireball, mdl, string, "fireball"); #ifdef GAMEQC /* model */ ATTRIB(Fireball, m_model, Model, MDL_FIREBALL_ITEM); diff --git a/qcsrc/common/weapons/weapon/hagar.qh b/qcsrc/common/weapons/weapon/hagar.qh index 42e5cbd3e..64bbd6ab7 100644 --- a/qcsrc/common/weapons/weapon/hagar.qh +++ b/qcsrc/common/weapons/weapon/hagar.qh @@ -6,7 +6,7 @@ CLASS(Hagar, Weapon) /* impulse */ ATTRIB(Hagar, impulse, int, 8); /* flags */ ATTRIB(Hagar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Hagar, bot_pickupbasevalue, float, 6000); -/* color */ ATTRIB(Hagar, wpcolor, vector, '1 1 0.5'); +/* color */ ATTRIB(Hagar, m_color, vector, '1 1 0.5'); /* modelname */ ATTRIB(Hagar, mdl, string, "hagar"); #ifdef GAMEQC /* model */ ATTRIB(Hagar, m_model, Model, MDL_HAGAR_ITEM); diff --git a/qcsrc/common/weapons/weapon/hlac.qh b/qcsrc/common/weapons/weapon/hlac.qh index 77cc7046f..662f6dc5c 100644 --- a/qcsrc/common/weapons/weapon/hlac.qh +++ b/qcsrc/common/weapons/weapon/hlac.qh @@ -6,7 +6,7 @@ CLASS(HLAC, Weapon) /* impulse */ ATTRIB(HLAC, impulse, int, 6); /* flags */ ATTRIB(HLAC, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(HLAC, bot_pickupbasevalue, float, 4000); -/* color */ ATTRIB(HLAC, wpcolor, vector, '0 1 0'); +/* color */ ATTRIB(HLAC, m_color, vector, '0 1 0'); /* modelname */ ATTRIB(HLAC, mdl, string, "hlac"); #ifdef GAMEQC /* model */ ATTRIB(HLAC, m_model, Model, MDL_HLAC_ITEM); diff --git a/qcsrc/common/weapons/weapon/hook.qh b/qcsrc/common/weapons/weapon/hook.qh index 538351835..492bc5a9c 100644 --- a/qcsrc/common/weapons/weapon/hook.qh +++ b/qcsrc/common/weapons/weapon/hook.qh @@ -6,7 +6,7 @@ CLASS(Hook, Weapon) /* impulse */ ATTRIB(Hook, impulse, int, 0); /* flags */ ATTRIB(Hook, spawnflags, int, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Hook, bot_pickupbasevalue, float, 0); -/* color */ ATTRIB(Hook, wpcolor, vector, '0 0.5 0'); +/* color */ ATTRIB(Hook, m_color, vector, '0 0.5 0'); /* modelname */ ATTRIB(Hook, mdl, string, "hookgun"); #ifdef GAMEQC /* model */ ATTRIB(Hook, m_model, Model, MDL_HOOK_ITEM); diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh index 824ecc3d4..d6e6b61a6 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qh +++ b/qcsrc/common/weapons/weapon/machinegun.qh @@ -6,7 +6,7 @@ CLASS(MachineGun, Weapon) /* impulse */ ATTRIB(MachineGun, impulse, int, 3); /* flags */ ATTRIB(MachineGun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_BLEED); /* rating */ ATTRIB(MachineGun, bot_pickupbasevalue, float, 7000); -/* color */ ATTRIB(MachineGun, wpcolor, vector, '1 1 0'); +/* color */ ATTRIB(MachineGun, m_color, vector, '1 1 0'); /* modelname */ ATTRIB(MachineGun, mdl, string, "uzi"); #ifdef GAMEQC /* model */ ATTRIB(MachineGun, m_model, Model, MDL_MACHINEGUN_ITEM); diff --git a/qcsrc/common/weapons/weapon/minelayer.qh b/qcsrc/common/weapons/weapon/minelayer.qh index 11618fc65..d6973a3fb 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qh +++ b/qcsrc/common/weapons/weapon/minelayer.qh @@ -6,7 +6,7 @@ CLASS(MineLayer, Weapon) /* impulse */ ATTRIB(MineLayer, impulse, int, 4); /* flags */ ATTRIB(MineLayer, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(MineLayer, bot_pickupbasevalue, float, 7000); -/* color */ ATTRIB(MineLayer, wpcolor, vector, '0.75 1 0'); +/* color */ ATTRIB(MineLayer, m_color, vector, '0.75 1 0'); /* modelname */ ATTRIB(MineLayer, mdl, string, "minelayer"); #ifdef GAMEQC /* model */ ATTRIB(MineLayer, m_model, Model, MDL_MINELAYER_ITEM); diff --git a/qcsrc/common/weapons/weapon/mortar.qh b/qcsrc/common/weapons/weapon/mortar.qh index 880965022..4da2388a4 100644 --- a/qcsrc/common/weapons/weapon/mortar.qh +++ b/qcsrc/common/weapons/weapon/mortar.qh @@ -6,7 +6,7 @@ CLASS(Mortar, Weapon) /* impulse */ ATTRIB(Mortar, impulse, int, 4); /* flags */ ATTRIB(Mortar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Mortar, bot_pickupbasevalue, float, 7000); -/* color */ ATTRIB(Mortar, wpcolor, vector, '1 0 0'); +/* color */ ATTRIB(Mortar, m_color, vector, '1 0 0'); /* modelname */ ATTRIB(Mortar, mdl, string, "gl"); #ifdef GAMEQC /* model */ ATTRIB(Mortar, m_model, Model, MDL_MORTAR_ITEM); diff --git a/qcsrc/common/weapons/weapon/porto.qh b/qcsrc/common/weapons/weapon/porto.qh index 75cd7474c..269152a15 100644 --- a/qcsrc/common/weapons/weapon/porto.qh +++ b/qcsrc/common/weapons/weapon/porto.qh @@ -6,7 +6,7 @@ CLASS(PortoLaunch, Weapon) /* impulse */ ATTRIB(PortoLaunch, impulse, int, 0); /* flags */ ATTRIB(PortoLaunch, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_SUPERWEAPON | WEP_FLAG_NODUAL | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(PortoLaunch, bot_pickupbasevalue, float, 0); -/* color */ ATTRIB(PortoLaunch, wpcolor, vector, '0.5 0.5 0.5'); +/* color */ ATTRIB(PortoLaunch, m_color, vector, '0.5 0.5 0.5'); /* modelname */ ATTRIB(PortoLaunch, mdl, string, "porto"); #ifdef GAMEQC /* model */ ATTRIB(PortoLaunch, m_model, Model, MDL_PORTO_ITEM); diff --git a/qcsrc/common/weapons/weapon/rifle.qh b/qcsrc/common/weapons/weapon/rifle.qh index 56f24b8f0..bf5633168 100644 --- a/qcsrc/common/weapons/weapon/rifle.qh +++ b/qcsrc/common/weapons/weapon/rifle.qh @@ -6,7 +6,7 @@ CLASS(Rifle, Weapon) /* impulse */ ATTRIB(Rifle, impulse, int, 7); /* flags */ ATTRIB(Rifle, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS); /* rating */ ATTRIB(Rifle, bot_pickupbasevalue, float, 7000); -/* color */ ATTRIB(Rifle, wpcolor, vector, '0.5 1 0'); +/* color */ ATTRIB(Rifle, m_color, vector, '0.5 1 0'); /* modelname */ ATTRIB(Rifle, mdl, string, "campingrifle"); #ifdef GAMEQC /* model */ ATTRIB(Rifle, m_model, Model, MDL_RIFLE_ITEM); diff --git a/qcsrc/common/weapons/weapon/seeker.qh b/qcsrc/common/weapons/weapon/seeker.qh index 053ed1a06..f9e8609a0 100644 --- a/qcsrc/common/weapons/weapon/seeker.qh +++ b/qcsrc/common/weapons/weapon/seeker.qh @@ -6,7 +6,7 @@ CLASS(Seeker, Weapon) /* impulse */ ATTRIB(Seeker, impulse, int, 8); /* flags */ ATTRIB(Seeker, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Seeker, bot_pickupbasevalue, float, 5000); -/* color */ ATTRIB(Seeker, wpcolor, vector, '0.5 1 0'); +/* color */ ATTRIB(Seeker, m_color, vector, '0.5 1 0'); /* modelname */ ATTRIB(Seeker, mdl, string, "seeker"); #ifdef GAMEQC /* model */ ATTRIB(Seeker, m_model, Model, MDL_SEEKER_ITEM); diff --git a/qcsrc/common/weapons/weapon/shockwave.qh b/qcsrc/common/weapons/weapon/shockwave.qh index fede776cb..b9b5855b5 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qh +++ b/qcsrc/common/weapons/weapon/shockwave.qh @@ -6,7 +6,7 @@ CLASS(Shockwave, Weapon) /* impulse */ ATTRIB(Shockwave, impulse, int, 2); /* flags */ ATTRIB(Shockwave, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_TYPE_HITSCAN | WEP_FLAG_CANCLIMB | WEP_TYPE_MELEE_SEC); /* rating */ ATTRIB(Shockwave, bot_pickupbasevalue, float, 3000); -/* color */ ATTRIB(Shockwave, wpcolor, vector, '0.5 0.25 0'); +/* color */ ATTRIB(Shockwave, m_color, vector, '0.5 0.25 0'); /* modelname */ ATTRIB(Shockwave, mdl, string, "shotgun"); #ifdef GAMEQC /* model */ ATTRIB(Shockwave, m_model, Model, MDL_SHOCKWAVE_ITEM); diff --git a/qcsrc/common/weapons/weapon/shotgun.qh b/qcsrc/common/weapons/weapon/shotgun.qh index be6121690..b53916163 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qh +++ b/qcsrc/common/weapons/weapon/shotgun.qh @@ -6,7 +6,7 @@ CLASS(Shotgun, Weapon) /* impulse */ ATTRIB(Shotgun, impulse, int, 2); /* flags */ ATTRIB(Shotgun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_TYPE_MELEE_SEC | WEP_FLAG_BLEED); /* rating */ ATTRIB(Shotgun, bot_pickupbasevalue, float, 6000); -/* color */ ATTRIB(Shotgun, wpcolor, vector, '0.5 0.25 0'); +/* color */ ATTRIB(Shotgun, m_color, vector, '0.5 0.25 0'); /* modelname */ ATTRIB(Shotgun, mdl, string, "shotgun"); #ifdef GAMEQC /* model */ ATTRIB(Shotgun, m_model, Model, MDL_SHOTGUN_ITEM); diff --git a/qcsrc/common/weapons/weapon/tuba.qh b/qcsrc/common/weapons/weapon/tuba.qh index 5de0b647b..8d5982914 100644 --- a/qcsrc/common/weapons/weapon/tuba.qh +++ b/qcsrc/common/weapons/weapon/tuba.qh @@ -5,7 +5,7 @@ CLASS(Tuba, Weapon) /* impulse */ ATTRIB(Tuba, impulse, int, 1); /* flags */ ATTRIB(Tuba, spawnflags, int, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH | WEP_FLAG_NODUAL | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Tuba, bot_pickupbasevalue, float, 2000); -/* color */ ATTRIB(Tuba, wpcolor, vector, '0 1 0'); +/* color */ ATTRIB(Tuba, m_color, vector, '0 1 0'); /* modelname */ ATTRIB(Tuba, mdl, string, "tuba"); #ifdef GAMEQC /* model */ ATTRIB(Tuba, m_model, Model, MDL_TUBA_ITEM); diff --git a/qcsrc/common/weapons/weapon/vaporizer.qh b/qcsrc/common/weapons/weapon/vaporizer.qh index 9f7b57104..a3e959f31 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qh +++ b/qcsrc/common/weapons/weapon/vaporizer.qh @@ -6,7 +6,7 @@ CLASS(Vaporizer, Weapon) /* impulse */ ATTRIB(Vaporizer, impulse, int, 7); /* flags */ ATTRIB(Vaporizer, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN | WEP_FLAG_NODUAL); /* rating */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, 10000); -/* color */ ATTRIB(Vaporizer, wpcolor, vector, '0.5 1 1'); +/* color */ ATTRIB(Vaporizer, m_color, vector, '0.5 1 1'); /* modelname */ ATTRIB(Vaporizer, mdl, string, "minstanex"); #ifdef GAMEQC /* model */ ATTRIB(Vaporizer, m_model, Model, MDL_VAPORIZER_ITEM); diff --git a/qcsrc/common/weapons/weapon/vortex.qh b/qcsrc/common/weapons/weapon/vortex.qh index 9914e3a7a..30d311674 100644 --- a/qcsrc/common/weapons/weapon/vortex.qh +++ b/qcsrc/common/weapons/weapon/vortex.qh @@ -6,7 +6,7 @@ CLASS(Vortex, Weapon) /* impulse */ ATTRIB(Vortex, impulse, int, 7); /* flags */ ATTRIB(Vortex, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN); /* rating */ ATTRIB(Vortex, bot_pickupbasevalue, float, 8000); -/* color */ ATTRIB(Vortex, wpcolor, vector, '0.5 1 1'); +/* color */ ATTRIB(Vortex, m_color, vector, '0.5 1 1'); /* modelname */ ATTRIB(Vortex, mdl, string, "nex"); #ifdef GAMEQC /* model */ ATTRIB(Vortex, m_model, Model, MDL_VORTEX_ITEM); diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 8ce5c570b..f614f4aff 100644 --- a/qcsrc/server/weapons/spawning.qc +++ b/qcsrc/server/weapons/spawning.qc @@ -150,7 +150,7 @@ void weapon_defaultspawnfunc(entity this, Weapon wpn) this.pickup_anyway = true; if(!this.owner) - this.glowmod = wpn.wpcolor; + this.glowmod = wpn.m_color; else this.glowmod = colormapPaletteColor(this.owner.clientcolors & 0x0F, true); -- 2.39.5