From 656d5610dadfd7d385afd05b78ab5414276b7e91 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Thu, 2 Jan 2014 18:12:34 -0500 Subject: [PATCH] commit message goes here --- qcsrc/common/weapons/w_arc.qc | 2 +- qcsrc/common/weapons/w_blaster.qc | 2 +- qcsrc/common/weapons/w_crylink.qc | 2 +- qcsrc/common/weapons/w_devastator.qc | 2 +- qcsrc/common/weapons/w_electro.qc | 2 +- qcsrc/common/weapons/w_fireball.qc | 2 +- qcsrc/common/weapons/w_hagar.qc | 2 +- qcsrc/common/weapons/w_hlac.qc | 2 +- qcsrc/common/weapons/w_hook.qc | 2 +- qcsrc/common/weapons/w_machinegun.qc | 2 +- qcsrc/common/weapons/w_minelayer.qc | 2 +- qcsrc/common/weapons/w_mortar.qc | 2 +- qcsrc/common/weapons/w_porto.qc | 2 +- qcsrc/common/weapons/w_rifle.qc | 2 +- qcsrc/common/weapons/w_seeker.qc | 2 +- qcsrc/common/weapons/w_shockwave.qc | 2 +- qcsrc/common/weapons/w_shotgun.qc | 2 +- qcsrc/common/weapons/w_tuba.qc | 2 +- qcsrc/common/weapons/w_vaporizer.qc | 2 +- qcsrc/common/weapons/w_vortex.qc | 2 +- qcsrc/common/weapons/weapons.qh | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index 15679e38f..2f6b76df3 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -296,7 +296,7 @@ void ArcInit() arc_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 2); arc_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 3); arc_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 4); - ARC_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + ARC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) } #endif #ifdef CSQC diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc index 7db42548f..69ccbe5e7 100644 --- a/qcsrc/common/weapons/w_blaster.qc +++ b/qcsrc/common/weapons/w_blaster.qc @@ -223,7 +223,7 @@ float W_Blaster(float request) precache_model("models/weapons/v_laser.md3"); precache_model("models/weapons/h_laser.iqm"); precache_sound("weapons/lasergun_fire.wav"); - BLASTER_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + BLASTER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc index 43436c18d..50b2208d6 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -640,7 +640,7 @@ float W_Crylink(float req) precache_sound ("weapons/crylink_fire.wav"); precache_sound ("weapons/crylink_fire2.wav"); precache_sound ("weapons/crylink_linkjoin.wav"); - CRYLINK_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + CRYLINK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_CHECKAMMO1: diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc index ac2ec9cfe..17d86fbe4 100644 --- a/qcsrc/common/weapons/w_devastator.qc +++ b/qcsrc/common/weapons/w_devastator.qc @@ -400,7 +400,7 @@ float W_Devastator(float req) precache_sound("weapons/rocket_fire.wav"); precache_sound("weapons/rocket_mode.wav"); } - DEVASTATOR_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + DEVASTATOR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc index f4e7d5335..d119dd0e8 100644 --- a/qcsrc/common/weapons/w_electro.qc +++ b/qcsrc/common/weapons/w_electro.qc @@ -484,7 +484,7 @@ float W_Electro(float req) precache_sound("weapons/electro_fire2.wav"); precache_sound("weapons/electro_impact.wav"); precache_sound("weapons/electro_impact_combo.wav"); - ELECTRO_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + ELECTRO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_CHECKAMMO1: diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc index e1cbefad2..28c7e46e6 100644 --- a/qcsrc/common/weapons/w_fireball.qc +++ b/qcsrc/common/weapons/w_fireball.qc @@ -402,7 +402,7 @@ float W_Fireball(float req) precache_sound ("weapons/fireball_fire.wav"); precache_sound ("weapons/fireball_fire2.wav"); precache_sound ("weapons/fireball_prefire2.wav"); - FIREBALL_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + FIREBALL_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc index 8aea670d8..e779cf3c7 100644 --- a/qcsrc/common/weapons/w_hagar.qc +++ b/qcsrc/common/weapons/w_hagar.qc @@ -448,7 +448,7 @@ float W_Hagar(float req) precache_sound ("weapons/hagar_fire.wav"); precache_sound ("weapons/hagar_load.wav"); precache_sound ("weapons/hagar_beep.wav"); - HAGAR_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + HAGAR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc index c60a48b4d..450a066e6 100644 --- a/qcsrc/common/weapons/w_hlac.qc +++ b/qcsrc/common/weapons/w_hlac.qc @@ -241,7 +241,7 @@ float W_HLAC(float req) precache_model ("models/weapons/v_hlac.md3"); precache_model ("models/weapons/h_hlac.iqm"); precache_sound ("weapons/lasergun_fire.wav"); - HLAC_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + HLAC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_CHECKAMMO1: diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc index 0ea8f680b..82b3b77b4 100644 --- a/qcsrc/common/weapons/w_hook.qc +++ b/qcsrc/common/weapons/w_hook.qc @@ -290,7 +290,7 @@ float W_Hook(float req) precache_sound ("weapons/hook_impact.wav"); // done by g_hook.qc precache_sound ("weapons/hook_fire.wav"); precache_sound ("weapons/hookbomb_fire.wav"); - HOOK_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + HOOK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc index f242a8b9d..04aad11b1 100644 --- a/qcsrc/common/weapons/w_machinegun.qc +++ b/qcsrc/common/weapons/w_machinegun.qc @@ -305,7 +305,7 @@ float W_MachineGun(float req) precache_model ("models/weapons/v_uzi.md3"); precache_model ("models/weapons/h_uzi.iqm"); precache_sound ("weapons/uzi_fire.wav"); - MACHINEGUN_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + MACHINEGUN_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_CHECKAMMO1: diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc index 0e5b0f20e..c3cf69573 100644 --- a/qcsrc/common/weapons/w_minelayer.qc +++ b/qcsrc/common/weapons/w_minelayer.qc @@ -537,7 +537,7 @@ float W_MineLayer(float req) precache_sound ("weapons/mine_fire.wav"); precache_sound ("weapons/mine_stick.wav"); precache_sound ("weapons/mine_trigger.wav"); - MINELAYER_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + MINELAYER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_CHECKAMMO1: diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc index 1e2032823..353dc3218 100644 --- a/qcsrc/common/weapons/w_mortar.qc +++ b/qcsrc/common/weapons/w_mortar.qc @@ -412,7 +412,7 @@ float W_Mortar(float req) precache_sound ("weapons/grenade_bounce6.wav"); precache_sound ("weapons/grenade_stick.wav"); precache_sound ("weapons/grenade_fire.wav"); - MORTAR_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + MORTAR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_CHECKAMMO1: diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc index e68f37c3a..b1c0124db 100644 --- a/qcsrc/common/weapons/w_porto.qc +++ b/qcsrc/common/weapons/w_porto.qc @@ -375,7 +375,7 @@ float W_Porto(float req) precache_sound ("porto/explode.wav"); precache_sound ("porto/fire.wav"); precache_sound ("porto/unsupported.wav"); - PORTO_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + PORTO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc index b3feb2cc7..af90b2b98 100644 --- a/qcsrc/common/weapons/w_rifle.qc +++ b/qcsrc/common/weapons/w_rifle.qc @@ -205,7 +205,7 @@ float W_Rifle(float req) precache_model ("models/weapons/h_campingrifle.iqm"); precache_sound ("weapons/campingrifle_fire.wav"); precache_sound ("weapons/campingrifle_fire2.wav"); - RIFLE_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + RIFLE_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_CHECKAMMO1: diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc index aabac65a9..b7a57e869 100644 --- a/qcsrc/common/weapons/w_seeker.qc +++ b/qcsrc/common/weapons/w_seeker.qc @@ -665,7 +665,7 @@ float W_Seeker(float req) precache_sound ("weapons/tag_fire.wav"); precache_sound ("weapons/flac_fire.wav"); precache_sound ("weapons/seeker_fire.wav"); - SEEKER_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + SEEKER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_CHECKAMMO1: diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc index 752e43b33..781fb4e6f 100644 --- a/qcsrc/common/weapons/w_shockwave.qc +++ b/qcsrc/common/weapons/w_shockwave.qc @@ -679,7 +679,7 @@ float W_Shockwave(float req) precache_sound("misc/itempickup.wav"); precache_sound("weapons/shockwave_fire.wav"); precache_sound("weapons/shockwave_melee.wav"); - SHOCKWAVE_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + SHOCKWAVE_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_CHECKAMMO1: diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc index 5db2380aa..c081c9318 100644 --- a/qcsrc/common/weapons/w_shotgun.qc +++ b/qcsrc/common/weapons/w_shotgun.qc @@ -245,7 +245,7 @@ float W_Shotgun(float req) precache_sound ("misc/itempickup.wav"); precache_sound ("weapons/shotgun_fire.wav"); precache_sound ("weapons/shotgun_melee.wav"); - SHOTGUN_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + SHOTGUN_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc index eb7dfa774..9d3f7dbe1 100644 --- a/qcsrc/common/weapons/w_tuba.qc +++ b/qcsrc/common/weapons/w_tuba.qc @@ -415,7 +415,7 @@ float W_Tuba(float req) precache_model ("models/weapons/h_akordeon.iqm"); precache_model ("models/weapons/v_kleinbottle.md3"); precache_model ("models/weapons/h_kleinbottle.iqm"); - TUBA_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + TUBA_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_vaporizer.qc b/qcsrc/common/weapons/w_vaporizer.qc index ce9bc6b10..e1e282314 100644 --- a/qcsrc/common/weapons/w_vaporizer.qc +++ b/qcsrc/common/weapons/w_vaporizer.qc @@ -192,7 +192,7 @@ float W_Vaporizer(float req) precache_sound("weapons/nexwhoosh2.wav"); precache_sound("weapons/nexwhoosh3.wav"); //W_Blaster(WR_INIT); // Samual: Is this really the proper thing to do? Didn't we already run this previously? - VAPORIZER_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + VAPORIZER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_vortex.qc b/qcsrc/common/weapons/w_vortex.qc index 9935f855f..19eba5ae4 100644 --- a/qcsrc/common/weapons/w_vortex.qc +++ b/qcsrc/common/weapons/w_vortex.qc @@ -248,7 +248,7 @@ float W_Vortex(float req) precache_sound ("weapons/nexwhoosh1.wav"); precache_sound ("weapons/nexwhoosh2.wav"); precache_sound ("weapons/nexwhoosh3.wav"); - VORTEX_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP) + VORTEX_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP) return TRUE; } case WR_CHECKAMMO1: diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh index ad7b351f7..70e476658 100644 --- a/qcsrc/common/weapons/weapons.qh +++ b/qcsrc/common/weapons/weapons.qh @@ -119,7 +119,7 @@ float GetAmmoStat(.float ammotype); #define WEP_CVAR_BOTH(wepname,isprimary,name) ((isprimary) ? WEP_CVAR_PRI(wepname, name) : WEP_CVAR_SEC(wepname, name)) // set initialization values for weapon settings -#define WEP_SKIPCVAR(unuseda,unusedb,unusedc,unusedd) /* skip cvars */ +#define WEP_SKIP_CVAR(unuseda,unusedb,unusedc,unusedd) /* skip cvars */ #define WEP_SET_PROP(wepid,wepname,type,prop,name) get_weaponinfo(WEP_##wepid).##prop = autocvar_g_balance_##wepname##_##name; -- 2.39.2