From 0e26c3902561461d57b86521f4b3cab9005c1121 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Thu, 2 Jan 2014 18:03:21 -0500 Subject: [PATCH] More descriptive stuff, better naming --- qcsrc/common/weapons/w_arc.qc | 4 ++-- qcsrc/common/weapons/w_blaster.qc | 4 ++-- qcsrc/common/weapons/w_crylink.qc | 4 ++-- qcsrc/common/weapons/w_devastator.qc | 4 ++-- qcsrc/common/weapons/w_electro.qc | 4 ++-- qcsrc/common/weapons/w_fireball.qc | 4 ++-- qcsrc/common/weapons/w_hagar.qc | 4 ++-- qcsrc/common/weapons/w_hlac.qc | 4 ++-- qcsrc/common/weapons/w_hook.qc | 4 ++-- qcsrc/common/weapons/w_machinegun.qc | 4 ++-- qcsrc/common/weapons/w_minelayer.qc | 4 ++-- qcsrc/common/weapons/w_mortar.qc | 4 ++-- qcsrc/common/weapons/w_porto.qc | 4 ++-- qcsrc/common/weapons/w_rifle.qc | 4 ++-- qcsrc/common/weapons/w_seeker.qc | 4 ++-- qcsrc/common/weapons/w_shockwave.qc | 4 ++-- qcsrc/common/weapons/w_shotgun.qc | 4 ++-- qcsrc/common/weapons/w_tuba.qc | 4 ++-- qcsrc/common/weapons/w_vaporizer.qc | 4 ++-- qcsrc/common/weapons/w_vortex.qc | 4 ++-- qcsrc/common/weapons/weapons.qc | 8 ++++---- qcsrc/common/weapons/weapons.qh | 6 +++--- 22 files changed, 47 insertions(+), 47 deletions(-) diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index bc316b09b..15679e38f 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '1 1 1', /* model */ "arc", /* crosshair */ "gfx/crosshairhlac 0.7", -/* netname */ "arc", -/* fullname */ _("Arc") +/* refname */ "arc", +/* wepname */ _("Arc") ); #define ARC_SETTINGS(w_cvar,w_prop) ARC_SETTINGS_LIST(w_cvar, w_prop, ARC, arc) diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc index cd4e7ee28..7db42548f 100644 --- a/qcsrc/common/weapons/w_blaster.qc +++ b/qcsrc/common/weapons/w_blaster.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '1 0.5 0.5', /* model */ "laser", /* crosshair */ "gfx/crosshairlaser 0.4", -/* netname */ "laser", -/* fullname */ _("Blaster") +/* refname */ "laser", +/* wepname */ _("Blaster") ); #define BLASTER_SETTINGS(w_cvar,w_prop) BLASTER_SETTINGS_LIST(w_cvar, w_prop, BLASTER, blaster) diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc index fa67c7e7b..43436c18d 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '1 0.5 1', /* model */ "crylink", /* crosshair */ "gfx/crosshaircrylink 0.4", -/* netname */ "crylink", -/* fullname */ _("Crylink") +/* refname */ "crylink", +/* wepname */ _("Crylink") ); #define CRYLINK_SETTINGS(w_cvar,w_prop) CRYLINK_SETTINGS_LIST(w_cvar, w_prop, CRYLINK, crylink) diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc index 22e8f9f29..ac2ec9cfe 100644 --- a/qcsrc/common/weapons/w_devastator.qc +++ b/qcsrc/common/weapons/w_devastator.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '1 1 0', /* model */ "rl", /* crosshair */ "gfx/crosshairrocketlauncher 0.5875", -/* netname */ "devastator", -/* fullname */ _("Devastator") +/* refname */ "devastator", +/* wepname */ _("Devastator") ); #define DEVASTATOR_SETTINGS(w_cvar,w_prop) DEVASTATOR_SETTINGS_LIST(w_cvar, w_prop, DEVASTATOR, devastator) diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc index 739487cb9..f4e7d5335 100644 --- a/qcsrc/common/weapons/w_electro.qc +++ b/qcsrc/common/weapons/w_electro.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0 0.5 1', /* model */ "electro", /* crosshair */ "gfx/crosshairelectro 0.5", -/* netname */ "electro", -/* fullname */ _("Electro") +/* refname */ "electro", +/* wepname */ _("Electro") ); #define ELECTRO_SETTINGS(w_cvar,w_prop) ELECTRO_SETTINGS_LIST(w_cvar, w_prop, ELECTRO, electro) diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc index 07537108a..e1cbefad2 100644 --- a/qcsrc/common/weapons/w_fireball.qc +++ b/qcsrc/common/weapons/w_fireball.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '1 0.5 0', /* model */ "fireball", /* crosshair */ "gfx/crosshairfireball", -/* netname */ "fireball", -/* fullname */ _("Fireball") +/* refname */ "fireball", +/* wepname */ _("Fireball") ); #define FIREBALL_SETTINGS(w_cvar,w_prop) FIREBALL_SETTINGS_LIST(w_cvar, w_prop, FIREBALL, fireball) diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc index b45bdc4c5..8aea670d8 100644 --- a/qcsrc/common/weapons/w_hagar.qc +++ b/qcsrc/common/weapons/w_hagar.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '1 1 0.5', /* model */ "hagar", /* crosshair */ "gfx/crosshairhagar 0.8", -/* netname */ "hagar", -/* fullname */ _("Hagar") +/* refname */ "hagar", +/* wepname */ _("Hagar") ); #define HAGAR_SETTINGS(w_cvar,w_prop) HAGAR_SETTINGS_LIST(w_cvar, w_prop, HAGAR, hagar) diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc index 848ebbf68..c60a48b4d 100644 --- a/qcsrc/common/weapons/w_hlac.qc +++ b/qcsrc/common/weapons/w_hlac.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0 1 0', /* model */ "hlac", /* crosshair */ "gfx/crosshairhlac 0.6", -/* netname */ "hlac", -/* fullname */ _("Heavy Laser Assault Cannon") +/* refname */ "hlac", +/* wepname */ _("Heavy Laser Assault Cannon") ); #define HLAC_SETTINGS(w_cvar,w_prop) HLAC_SETTINGS_LIST(w_cvar, w_prop, HLAC, hlac) diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc index ae1f519f5..0ea8f680b 100644 --- a/qcsrc/common/weapons/w_hook.qc +++ b/qcsrc/common/weapons/w_hook.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0 0.5 0', /* model */ "hookgun", /* crosshair */ "gfx/crosshairhook 0.5", -/* netname */ "hook", -/* fullname */ _("Grappling Hook") +/* refname */ "hook", +/* wepname */ _("Grappling Hook") ); #define HOOK_SETTINGS(w_cvar,w_prop) HOOK_SETTINGS_LIST(w_cvar, w_prop, HOOK, hook) diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc index 35dcfab61..f242a8b9d 100644 --- a/qcsrc/common/weapons/w_machinegun.qc +++ b/qcsrc/common/weapons/w_machinegun.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '1 1 0', /* model */ "uzi", /* crosshair */ "gfx/crosshairuzi 0.6", -/* netname */ "uzi", -/* fullname */ _("Machine Gun") +/* refname */ "uzi", +/* wepname */ _("Machine Gun") ); #define MACHINEGUN_SETTINGS(w_cvar,w_prop) MACHINEGUN_SETTINGS_LIST(w_cvar, w_prop, MACHINEGUN, machinegun) diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc index e1ff57239..0e5b0f20e 100644 --- a/qcsrc/common/weapons/w_minelayer.qc +++ b/qcsrc/common/weapons/w_minelayer.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0.75 1 0', /* model */ "minelayer", /* crosshair */ "gfx/crosshairminelayer 0.9", -/* netname */ "minelayer", -/* fullname */ _("Mine Layer") +/* refname */ "minelayer", +/* wepname */ _("Mine Layer") ); #define MINELAYER_SETTINGS(w_cvar,w_prop) MINELAYER_SETTINGS_LIST(w_cvar, w_prop, MINE_LAYER, minelayer) diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc index a69f36012..1e2032823 100644 --- a/qcsrc/common/weapons/w_mortar.qc +++ b/qcsrc/common/weapons/w_mortar.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '1 0 0', /* model */ "gl", /* crosshair */ "gfx/crosshairgrenadelauncher 0.7", -/* netname */ "grenadelauncher", -/* fullname */ _("Mortar") +/* refname */ "grenadelauncher", +/* wepname */ _("Mortar") ); #define MORTAR_SETTINGS(w_cvar,w_prop) MORTAR_SETTINGS_LIST(w_cvar, w_prop, MORTAR, mortar) diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc index aa1a9b6ca..e68f37c3a 100644 --- a/qcsrc/common/weapons/w_porto.qc +++ b/qcsrc/common/weapons/w_porto.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0.5 0.5 0.5', /* model */ "porto" , /* crosshair */ "gfx/crosshairporto 0.6", -/* netname */ "porto", -/* fullname */ _("Port-O-Launch") +/* refname */ "porto", +/* wepname */ _("Port-O-Launch") ); #define PORTO_SETTINGS(w_cvar,w_prop) PORTO_SETTINGS_LIST(w_cvar, w_prop, PORTO, porto) diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc index fc2602d5f..b3feb2cc7 100644 --- a/qcsrc/common/weapons/w_rifle.qc +++ b/qcsrc/common/weapons/w_rifle.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0.5 1 0', /* model */ "campingrifle", /* crosshair */ "gfx/crosshairrifle 0.5", -/* netname */ "rifle", -/* fullname */ _("Rifle") +/* refname */ "rifle", +/* wepname */ _("Rifle") ); #define RIFLE_SETTINGS(w_cvar,w_prop) RIFLE_SETTINGS_LIST(w_cvar, w_prop, RIFLE, rifle) diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc index b92e6800c..aabac65a9 100644 --- a/qcsrc/common/weapons/w_seeker.qc +++ b/qcsrc/common/weapons/w_seeker.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0.5 1 0', /* model */ "seeker", /* crosshair */ "gfx/crosshairseeker 0.8", -/* netname */ "seeker", -/* fullname */ _("T.A.G. Seeker") +/* refname */ "seeker", +/* wepname */ _("T.A.G. Seeker") ); #define SEEKER_SETTINGS(w_cvar,w_prop) SEEKER_SETTINGS_LIST(w_cvar, w_prop, SEEKER, seeker) diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc index 060b9e2e5..752e43b33 100644 --- a/qcsrc/common/weapons/w_shockwave.qc +++ b/qcsrc/common/weapons/w_shockwave.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0.5 0.25 0', /* model */ "shotgun", /* crosshair */ "gfx/crosshairshotgun 0.7", -/* netname */ "shockwave", -/* fullname */ _("Shockwave") +/* refname */ "shockwave", +/* wepname */ _("Shockwave") ); #define SHOCKWAVE_SETTINGS(w_cvar,w_prop) SHOCKWAVE_SETTINGS_LIST(w_cvar, w_prop, SHOCKWAVE, shockwave) diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc index f8854f250..5db2380aa 100644 --- a/qcsrc/common/weapons/w_shotgun.qc +++ b/qcsrc/common/weapons/w_shotgun.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0.5 0.25 0', /* model */ "shotgun", /* crosshair */ "gfx/crosshairshotgun 0.65", -/* shortname */ "shotgun", -/* fullname */ _("Shotgun") +/* refname */ "shotgun", +/* wepname */ _("Shotgun") ); #define SHOTGUN_SETTINGS(w_cvar,w_prop) SHOTGUN_SETTINGS_LIST(w_cvar, w_prop, SHOTGUN, shotgun) diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc index ab5a24edb..eb7dfa774 100644 --- a/qcsrc/common/weapons/w_tuba.qc +++ b/qcsrc/common/weapons/w_tuba.qc @@ -9,9 +9,9 @@ REGISTER_WEAPON( /* color */ '0 1 0', /* model */ "tuba", /* crosshair */ "gfx/crosshairtuba", -/* netname */ "tuba", +/* refname */ "tuba", /* xgettext:no-c-format */ -/* fullname */ _("@!#%'n Tuba") +/* wepname */ _("@!#%'n Tuba") ); #define TUBA_SETTINGS(w_cvar,w_prop) TUBA_SETTINGS_LIST(w_cvar, w_prop, TUBA, tuba) diff --git a/qcsrc/common/weapons/w_vaporizer.qc b/qcsrc/common/weapons/w_vaporizer.qc index 40b7668ce..ce9bc6b10 100644 --- a/qcsrc/common/weapons/w_vaporizer.qc +++ b/qcsrc/common/weapons/w_vaporizer.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0.5 1 1', /* model */ "minstanex", /* crosshair */ "gfx/crosshairminstanex 0.4", -/* netname */ "minstanex", -/* fullname */ _("Vaporizer") +/* refname */ "minstanex", +/* wepname */ _("Vaporizer") ); #define VAPORIZER_SETTINGS(w_cvar,w_prop) VAPORIZER_SETTINGS_LIST(w_cvar, w_prop, VAPORIZER, vaporizer) diff --git a/qcsrc/common/weapons/w_vortex.qc b/qcsrc/common/weapons/w_vortex.qc index 43cbd4ef8..9935f855f 100644 --- a/qcsrc/common/weapons/w_vortex.qc +++ b/qcsrc/common/weapons/w_vortex.qc @@ -9,8 +9,8 @@ REGISTER_WEAPON( /* color */ '0.5 1 1', /* model */ "nex", /* crosshair */ "gfx/crosshairnex 0.65", -/* netname */ "nex", -/* fullname */ _("Vortex") +/* refname */ "nex", +/* wepname */ _("Vortex") ); #define VORTEX_SETTINGS(w_cvar,w_prop) VORTEX_SETTINGS_LIST(w_cvar, w_prop, VORTEX, vortex) diff --git a/qcsrc/common/weapons/weapons.qc b/qcsrc/common/weapons/weapons.qc index b7ecf1c73..c0033cb82 100644 --- a/qcsrc/common/weapons/weapons.qc +++ b/qcsrc/common/weapons/weapons.qc @@ -85,8 +85,8 @@ void register_weapon( vector clr, string modelname, string crosshair, - string shortname, - string wname) + string refname, + string wepname) { entity e; weapon_info[id - 1] = e = spawn(); @@ -105,8 +105,8 @@ void register_weapon( 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(strcat("wpn-", ftos(id))); - e.netname = shortname; - e.message = wname; + e.netname = refname; + e.message = wepname; #ifndef MENUQC func(WR_INIT); diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh index 3c0ac8577..ad7b351f7 100644 --- a/qcsrc/common/weapons/weapons.qh +++ b/qcsrc/common/weapons/weapons.qh @@ -158,10 +158,10 @@ void register_weapons_done(); .string model2; // A: wpn-id // wpn- sprite name .string mdl; // M: model // modelname without g_, v_, w_ .string model; // A: model // full name of g_ model -.string w_crosshair; -.float w_crosshair_size; +.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 netname; // M: refname // reference name name -.string message; // M: fullname // human readable name +.string message; // M: wepname // human readable name // note: the fabs call is just there to hide "if result is constant" warning -- 2.39.2