From b8c937b2b43c647257fec24f842fefeae515e70b Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Thu, 2 Jan 2014 16:39:55 -0500 Subject: [PATCH] Fix spacing of register_weapon lists --- qcsrc/common/weapons/w_arc.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_blaster.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_crylink.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_devastator.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_electro.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_fireball.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_hagar.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_hlac.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_hook.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_machinegun.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_minelayer.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_mortar.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_porto.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_rifle.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_seeker.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_shockwave.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_shotgun.qc | 2 +- qcsrc/common/weapons/w_tuba.qc | 18 +++++++++--------- qcsrc/common/weapons/w_vaporizer.qc | 20 ++++++++++---------- qcsrc/common/weapons/w_vortex.qc | 20 ++++++++++---------- 20 files changed, 190 insertions(+), 190 deletions(-) diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index 9875c17ad..bc316b09b 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ ARC, -/* function */ W_Arc, -/* ammotype */ ammo_cells, -/* impulse */ 3, -/* flags */ WEP_FLAG_NORMAL, -/* rating */ BOT_PICKUP_RATING_HIGH, -/* color */ '1 1 1', -/* model */ "arc", +/* WEP_##id */ ARC, +/* function */ W_Arc, +/* ammotype */ ammo_cells, +/* impulse */ 3, +/* flags */ WEP_FLAG_NORMAL, +/* rating */ BOT_PICKUP_RATING_HIGH, +/* color */ '1 1 1', +/* model */ "arc", /* crosshair */ "gfx/crosshairhlac 0.7", -/* netname */ "arc", -/* fullname */ _("Arc") +/* netname */ "arc", +/* fullname */ _("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 c1e8c6323..cd4e7ee28 100644 --- a/qcsrc/common/weapons/w_blaster.qc +++ b/qcsrc/common/weapons/w_blaster.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ BLASTER, -/* function */ W_Blaster, -/* ammotype */ ammo_none, -/* impulse */ 1, -/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, -/* rating */ 0, -/* color */ '1 0.5 0.5', -/* model */ "laser", +/* WEP_##id */ BLASTER, +/* function */ W_Blaster, +/* ammotype */ ammo_none, +/* impulse */ 1, +/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, +/* rating */ 0, +/* color */ '1 0.5 0.5', +/* model */ "laser", /* crosshair */ "gfx/crosshairlaser 0.4", -/* netname */ "laser", -/* fullname */ _("Blaster") +/* netname */ "laser", +/* fullname */ _("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 7fc2db221..fa67c7e7b 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ CRYLINK, -/* function */ W_Crylink, -/* ammotype */ ammo_cells, -/* impulse */ 6, -/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, -/* rating */ BOT_PICKUP_RATING_MID, -/* color */ '1 0.5 1', -/* model */ "crylink", +/* WEP_##id */ CRYLINK, +/* function */ W_Crylink, +/* ammotype */ ammo_cells, +/* impulse */ 6, +/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_MID, +/* color */ '1 0.5 1', +/* model */ "crylink", /* crosshair */ "gfx/crosshaircrylink 0.4", -/* netname */ "crylink", -/* fullname */ _("Crylink") +/* netname */ "crylink", +/* fullname */ _("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 774b30e04..22e8f9f29 100644 --- a/qcsrc/common/weapons/w_devastator.qc +++ b/qcsrc/common/weapons/w_devastator.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ DEVASTATOR, -/* function */ W_Devastator, -/* ammotype */ ammo_rockets, -/* impulse */ 9, -/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, -/* rating */ BOT_PICKUP_RATING_HIGH, -/* color */ '1 1 0', -/* model */ "rl", +/* WEP_##id */ DEVASTATOR, +/* function */ W_Devastator, +/* ammotype */ ammo_rockets, +/* impulse */ 9, +/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_HIGH, +/* color */ '1 1 0', +/* model */ "rl", /* crosshair */ "gfx/crosshairrocketlauncher 0.5875", -/* netname */ "devastator", -/* fullname */ _("Devastator") +/* netname */ "devastator", +/* fullname */ _("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 a089aedd0..739487cb9 100644 --- a/qcsrc/common/weapons/w_electro.qc +++ b/qcsrc/common/weapons/w_electro.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ ELECTRO, -/* function */ W_Electro, -/* ammotype */ ammo_cells, -/* impulse */ 5, -/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, -/* rating */ BOT_PICKUP_RATING_MID, -/* color */ '0 0.5 1', -/* model */ "electro", +/* WEP_##id */ ELECTRO, +/* function */ W_Electro, +/* ammotype */ ammo_cells, +/* impulse */ 5, +/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_MID, +/* color */ '0 0.5 1', +/* model */ "electro", /* crosshair */ "gfx/crosshairelectro 0.5", -/* netname */ "electro", -/* fullname */ _("Electro") +/* netname */ "electro", +/* fullname */ _("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 d52a565d3..07537108a 100644 --- a/qcsrc/common/weapons/w_fireball.qc +++ b/qcsrc/common/weapons/w_fireball.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ FIREBALL, -/* function */ W_Fireball, -/* ammotype */ ammo_none, -/* impulse */ 9, -/* flags */ WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH, -/* rating */ BOT_PICKUP_RATING_MID, -/* color */ '1 0.5 0', -/* model */ "fireball", +/* WEP_##id */ FIREBALL, +/* function */ W_Fireball, +/* ammotype */ ammo_none, +/* impulse */ 9, +/* flags */ WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_MID, +/* color */ '1 0.5 0', +/* model */ "fireball", /* crosshair */ "gfx/crosshairfireball", -/* netname */ "fireball", -/* fullname */ _("Fireball") +/* netname */ "fireball", +/* fullname */ _("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 c1ddd5f27..b45bdc4c5 100644 --- a/qcsrc/common/weapons/w_hagar.qc +++ b/qcsrc/common/weapons/w_hagar.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ HAGAR, -/* function */ W_Hagar, -/* ammotype */ ammo_rockets, -/* impulse */ 8, -/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, -/* rating */ BOT_PICKUP_RATING_MID, -/* color */ '1 1 0.5', -/* model */ "hagar", +/* WEP_##id */ HAGAR, +/* function */ W_Hagar, +/* ammotype */ ammo_rockets, +/* impulse */ 8, +/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_MID, +/* color */ '1 1 0.5', +/* model */ "hagar", /* crosshair */ "gfx/crosshairhagar 0.8", -/* netname */ "hagar", -/* fullname */ _("Hagar") +/* netname */ "hagar", +/* fullname */ _("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 beb71908d..848ebbf68 100644 --- a/qcsrc/common/weapons/w_hlac.qc +++ b/qcsrc/common/weapons/w_hlac.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ HLAC, -/* function */ W_HLAC, -/* ammotype */ ammo_cells, -/* impulse */ 6, -/* flags */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, -/* rating */ BOT_PICKUP_RATING_MID, -/* color */ '0 1 0', -/* model */ "hlac", +/* WEP_##id */ HLAC, +/* function */ W_HLAC, +/* ammotype */ ammo_cells, +/* impulse */ 6, +/* flags */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_MID, +/* color */ '0 1 0', +/* model */ "hlac", /* crosshair */ "gfx/crosshairhlac 0.6", -/* netname */ "hlac", -/* fullname */ _("Heavy Laser Assault Cannon") +/* netname */ "hlac", +/* fullname */ _("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 36b27ea81..ae1f519f5 100644 --- a/qcsrc/common/weapons/w_hook.qc +++ b/qcsrc/common/weapons/w_hook.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ HOOK, -/* function */ W_Hook, -/* ammotype */ ammo_fuel, -/* impulse */ 0, -/* flags */ WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, -/* rating */ 0, -/* color */ '0 0.5 0', -/* model */ "hookgun", +/* WEP_##id */ HOOK, +/* function */ W_Hook, +/* ammotype */ ammo_fuel, +/* impulse */ 0, +/* flags */ WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, +/* rating */ 0, +/* color */ '0 0.5 0', +/* model */ "hookgun", /* crosshair */ "gfx/crosshairhook 0.5", -/* netname */ "hook", -/* fullname */ _("Grappling Hook") +/* netname */ "hook", +/* fullname */ _("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 72a0cebfa..35dcfab61 100644 --- a/qcsrc/common/weapons/w_machinegun.qc +++ b/qcsrc/common/weapons/w_machinegun.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ MACHINEGUN, -/* function */ W_MachineGun, -/* ammotype */ ammo_nails, -/* impulse */ 3, -/* flags */ WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, -/* rating */ BOT_PICKUP_RATING_MID, -/* color */ '1 1 0', -/* model */ "uzi", +/* WEP_##id */ MACHINEGUN, +/* function */ W_MachineGun, +/* ammotype */ ammo_nails, +/* impulse */ 3, +/* flags */ WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, +/* rating */ BOT_PICKUP_RATING_MID, +/* color */ '1 1 0', +/* model */ "uzi", /* crosshair */ "gfx/crosshairuzi 0.6", -/* netname */ "uzi", -/* fullname */ _("Machine Gun") +/* netname */ "uzi", +/* fullname */ _("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 e52606b5c..e1ff57239 100644 --- a/qcsrc/common/weapons/w_minelayer.qc +++ b/qcsrc/common/weapons/w_minelayer.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ MINE_LAYER, -/* function */ W_MineLayer, -/* ammotype */ ammo_rockets, -/* impulse */ 4, -/* flags */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, -/* rating */ BOT_PICKUP_RATING_HIGH, -/* color */ '0.75 1 0', -/* model */ "minelayer", +/* WEP_##id */ MINE_LAYER, +/* function */ W_MineLayer, +/* ammotype */ ammo_rockets, +/* impulse */ 4, +/* flags */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_HIGH, +/* color */ '0.75 1 0', +/* model */ "minelayer", /* crosshair */ "gfx/crosshairminelayer 0.9", -/* netname */ "minelayer", -/* fullname */ _("Mine Layer") +/* netname */ "minelayer", +/* fullname */ _("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 c9d36bb88..a69f36012 100644 --- a/qcsrc/common/weapons/w_mortar.qc +++ b/qcsrc/common/weapons/w_mortar.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ MORTAR, -/* function */ W_Mortar, -/* ammotype */ ammo_rockets, -/* impulse */ 4, -/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, -/* rating */ BOT_PICKUP_RATING_MID, -/* color */ '1 0 0', -/* model */ "gl", +/* WEP_##id */ MORTAR, +/* function */ W_Mortar, +/* ammotype */ ammo_rockets, +/* impulse */ 4, +/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_MID, +/* color */ '1 0 0', +/* model */ "gl", /* crosshair */ "gfx/crosshairgrenadelauncher 0.7", -/* netname */ "grenadelauncher", -/* fullname */ _("Mortar") +/* netname */ "grenadelauncher", +/* fullname */ _("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 a4c3ce2c5..aa1a9b6ca 100644 --- a/qcsrc/common/weapons/w_porto.qc +++ b/qcsrc/common/weapons/w_porto.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ PORTO, -/* function */ W_Porto, -/* ammotype */ ammo_none, -/* impulse */ 0, -/* flags */ WEP_TYPE_OTHER | WEP_FLAG_SUPERWEAPON, -/* rating */ 0, -/* color */ '0.5 0.5 0.5', -/* model */ "porto" , +/* WEP_##id */ PORTO, +/* function */ W_Porto, +/* ammotype */ ammo_none, +/* impulse */ 0, +/* flags */ WEP_TYPE_OTHER | WEP_FLAG_SUPERWEAPON, +/* rating */ 0, +/* color */ '0.5 0.5 0.5', +/* model */ "porto" , /* crosshair */ "gfx/crosshairporto 0.6", -/* netname */ "porto", -/* fullname */ _("Port-O-Launch") +/* netname */ "porto", +/* fullname */ _("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 49d43a0bb..fc2602d5f 100644 --- a/qcsrc/common/weapons/w_rifle.qc +++ b/qcsrc/common/weapons/w_rifle.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ RIFLE, -/* function */ W_Rifle, -/* ammotype */ ammo_nails, -/* impulse */ 7, -/* flags */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, -/* rating */ BOT_PICKUP_RATING_MID, -/* color */ '0.5 1 0', -/* model */ "campingrifle", +/* WEP_##id */ RIFLE, +/* function */ W_Rifle, +/* ammotype */ ammo_nails, +/* impulse */ 7, +/* flags */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, +/* rating */ BOT_PICKUP_RATING_MID, +/* color */ '0.5 1 0', +/* model */ "campingrifle", /* crosshair */ "gfx/crosshairrifle 0.5", -/* netname */ "rifle", -/* fullname */ _("Rifle") +/* netname */ "rifle", +/* fullname */ _("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 8200eeb7d..b92e6800c 100644 --- a/qcsrc/common/weapons/w_seeker.qc +++ b/qcsrc/common/weapons/w_seeker.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ SEEKER, -/* function */ W_Seeker, -/* ammotype */ ammo_rockets, -/* impulse */ 8, -/* flags */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, -/* rating */ BOT_PICKUP_RATING_MID, -/* color */ '0.5 1 0', -/* model */ "seeker", +/* WEP_##id */ SEEKER, +/* function */ W_Seeker, +/* ammotype */ ammo_rockets, +/* impulse */ 8, +/* flags */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_MID, +/* color */ '0.5 1 0', +/* model */ "seeker", /* crosshair */ "gfx/crosshairseeker 0.8", -/* netname */ "seeker", -/* fullname */ _("T.A.G. Seeker") +/* netname */ "seeker", +/* fullname */ _("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 d78411482..060b9e2e5 100644 --- a/qcsrc/common/weapons/w_shockwave.qc +++ b/qcsrc/common/weapons/w_shockwave.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ SHOCKWAVE, -/* function */ W_Shockwave, -/* ammotype */ ammo_none, -/* impulse */ 2, -/* flags */ WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, -/* rating */ BOT_PICKUP_RATING_LOW, -/* color */ '0.5 0.25 0', -/* model */ "shotgun", +/* WEP_##id */ SHOCKWAVE, +/* function */ W_Shockwave, +/* ammotype */ ammo_none, +/* impulse */ 2, +/* flags */ WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, +/* rating */ BOT_PICKUP_RATING_LOW, +/* color */ '0.5 0.25 0', +/* model */ "shotgun", /* crosshair */ "gfx/crosshairshotgun 0.7", -/* netname */ "shockwave", -/* fullname */ _("Shockwave") +/* netname */ "shockwave", +/* fullname */ _("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 95dc3781f..f8854f250 100644 --- a/qcsrc/common/weapons/w_shotgun.qc +++ b/qcsrc/common/weapons/w_shotgun.qc @@ -6,7 +6,7 @@ REGISTER_WEAPON( /* impulse */ 2, /* flags */ WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED, /* rating */ BOT_PICKUP_RATING_LOW, -/* color */ '0.5 0.25 0', +/* color */ '0.5 0.25 0', /* model */ "shotgun", /* crosshair */ "gfx/crosshairshotgun 0.65", /* shortname */ "shotgun", diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc index 707d3836a..ab5a24edb 100644 --- a/qcsrc/common/weapons/w_tuba.qc +++ b/qcsrc/common/weapons/w_tuba.qc @@ -1,15 +1,15 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ TUBA, -/* function */ W_Tuba, -/* ammotype */ ammo_none, -/* impulse */ 1, -/* flags */ WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH, -/* rating */ BOT_PICKUP_RATING_MID, -/* color */ '0 1 0', -/* model */ "tuba", +/* WEP_##id */ TUBA, +/* function */ W_Tuba, +/* ammotype */ ammo_none, +/* impulse */ 1, +/* flags */ WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH, +/* rating */ BOT_PICKUP_RATING_MID, +/* color */ '0 1 0', +/* model */ "tuba", /* crosshair */ "gfx/crosshairtuba", -/* netname */ "tuba", +/* netname */ "tuba", /* xgettext:no-c-format */ /* fullname */ _("@!#%'n Tuba") ); diff --git a/qcsrc/common/weapons/w_vaporizer.qc b/qcsrc/common/weapons/w_vaporizer.qc index 5d792f033..40b7668ce 100644 --- a/qcsrc/common/weapons/w_vaporizer.qc +++ b/qcsrc/common/weapons/w_vaporizer.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ VAPORIZER, -/* function */ W_Vaporizer, -/* ammotype */ ammo_cells, -/* impulse */ 7, -/* flags */ WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN, -/* rating */ BOT_PICKUP_RATING_HIGH, -/* color */ '0.5 1 1', -/* model */ "minstanex", +/* WEP_##id */ VAPORIZER, +/* function */ W_Vaporizer, +/* ammotype */ ammo_cells, +/* impulse */ 7, +/* flags */ WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN, +/* rating */ BOT_PICKUP_RATING_HIGH, +/* color */ '0.5 1 1', +/* model */ "minstanex", /* crosshair */ "gfx/crosshairminstanex 0.4", -/* netname */ "minstanex", -/* fullname */ _("Vaporizer") +/* netname */ "minstanex", +/* fullname */ _("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 9900dbefb..43cbd4ef8 100644 --- a/qcsrc/common/weapons/w_vortex.qc +++ b/qcsrc/common/weapons/w_vortex.qc @@ -1,16 +1,16 @@ #ifdef REGISTER_WEAPON REGISTER_WEAPON( -/* WEP_##id */ VORTEX, -/* function */ W_Vortex, -/* ammotype */ ammo_cells, -/* impulse */ 7, -/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, -/* rating */ BOT_PICKUP_RATING_HIGH, -/* color */ '0.5 1 1', -/* model */ "nex", +/* WEP_##id */ VORTEX, +/* function */ W_Vortex, +/* ammotype */ ammo_cells, +/* impulse */ 7, +/* flags */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, +/* rating */ BOT_PICKUP_RATING_HIGH, +/* color */ '0.5 1 1', +/* model */ "nex", /* crosshair */ "gfx/crosshairnex 0.65", -/* netname */ "nex", -/* fullname */ _("Vortex") +/* netname */ "nex", +/* fullname */ _("Vortex") ); #define VORTEX_SETTINGS(w_cvar,w_prop) VORTEX_SETTINGS_LIST(w_cvar, w_prop, VORTEX, vortex) -- 2.39.2