From 3b7424b94d5561161479d9fb8516f2b71ca2e629 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sun, 30 Jun 2013 21:21:20 -0400 Subject: [PATCH] Even more cleanup (sort of) --- qcsrc/common/weapons/config.qh | 4 ++-- qcsrc/common/weapons/w_arc.qc | 7 +------ qcsrc/common/weapons/w_crylink.qc | 6 +----- qcsrc/common/weapons/w_devastator.qc | 7 +------ qcsrc/common/weapons/w_fireball.qc | 6 +----- qcsrc/common/weapons/w_hagar.qc | 6 +----- qcsrc/common/weapons/w_hook.qc | 6 +----- qcsrc/common/weapons/w_machinegun.qc | 6 +----- qcsrc/common/weapons/w_minelayer.qc | 6 +----- qcsrc/common/weapons/w_mortar.qc | 7 +------ qcsrc/common/weapons/w_nex.qc | 6 +----- qcsrc/common/weapons/w_porto.qc | 6 +----- qcsrc/common/weapons/w_rifle.qc | 6 +----- qcsrc/common/weapons/weapons.qh | 7 +++++++ 14 files changed, 21 insertions(+), 65 deletions(-) diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh index 12ce34078..316da5fa6 100644 --- a/qcsrc/common/weapons/config.qh +++ b/qcsrc/common/weapons/config.qh @@ -50,7 +50,7 @@ string wep_config_queue[MAX_WEP_CONFIG]; #endif // WEAPONTODO: remove prop -#define WEP_CONFIG_WRITE_PROPS(weapon,prop,name) \ +#define WEP_CONFIG_WRITE_PROPS(weapon,name) \ { WEP_CONFIG_QUEUE(sprintf("set g_balance_%s_%s %g\n", \ #weapon, \ #name, \ @@ -58,7 +58,7 @@ string wep_config_queue[MAX_WEP_CONFIG]; #define WEP_CONFIG_SETTINGS(wepsettings) \ #define WEP_ADD_CVAR(weapon,mode,name) WEP_CONFIG_WRITE_CVARS(weapon,mode,name) \ - #define WEP_ADD_PROP(weapon,prop,name) WEP_CONFIG_WRITE_PROPS(weapon,prop,name) \ + #define WEP_ADD_PROP(weapon,prop,name) WEP_CONFIG_WRITE_PROPS(weapon,name) \ wepsettings \ #undef WEP_ADD_CVAR \ #undef WEP_ADD_PROP diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index f7944ae0d..09ba8b67f 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -297,12 +297,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); - - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_ARC,weapon,prop,name) - ARC_SETTINGS(arc) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(ARC_SETTINGS(arc), WEP_ARC) } #endif #ifdef CSQC diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc index e12fae8ad..8a107636c 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -635,11 +635,7 @@ float w_crylink(float req) precache_sound ("weapons/crylink_fire.wav"); precache_sound ("weapons/crylink_fire2.wav"); precache_sound ("weapons/crylink_linkjoin.wav"); - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_CRYLINK,weapon,prop,name) - CRYLINK_SETTINGS(crylink) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(CRYLINK_SETTINGS(crylink), WEP_CRYLINK) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc index 12d7cdb83..347652ef4 100644 --- a/qcsrc/common/weapons/w_devastator.qc +++ b/qcsrc/common/weapons/w_devastator.qc @@ -464,12 +464,7 @@ float W_Devastator(float req) precache_sound("weapons/rocket_fire.wav"); precache_sound("weapons/rocket_mode.wav"); } - - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_DEVASTATOR,weapon,prop,name) - ARC_SETTINGS(devastator) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(DEVASTATOR_SETTINGS(devastator), WEP_DEVASTATOR) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc index 19879ac86..a45f08332 100644 --- a/qcsrc/common/weapons/w_fireball.qc +++ b/qcsrc/common/weapons/w_fireball.qc @@ -396,11 +396,7 @@ float w_fireball(float req) precache_sound ("weapons/fireball_fire.wav"); precache_sound ("weapons/fireball_fire2.wav"); precache_sound ("weapons/fireball_prefire2.wav"); - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_FIREBALL,weapon,prop,name) - FIREBALL_SETTINGS(fireball) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(FIREBALL_SETTINGS(fireball), WEP_FIREBALL) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc index 711f5b531..779333d87 100644 --- a/qcsrc/common/weapons/w_hagar.qc +++ b/qcsrc/common/weapons/w_hagar.qc @@ -442,11 +442,7 @@ float w_hagar(float req) precache_sound ("weapons/hagar_fire.wav"); precache_sound ("weapons/hagar_load.wav"); precache_sound ("weapons/hagar_beep.wav"); - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_HAGAR,weapon,prop,name) - HAGAR_SETTINGS(hagar) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(HAGAR_SETTINGS(hagar), WEP_HAGAR) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc index 4c277069d..a9f2bad8f 100644 --- a/qcsrc/common/weapons/w_hook.qc +++ b/qcsrc/common/weapons/w_hook.qc @@ -286,11 +286,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"); - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_HOOK,weapon,prop,name) - HOOK_SETTINGS(hook) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(HOOK_SETTINGS(hook), WEP_HOOK) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc index d84c2b14d..216f55397 100644 --- a/qcsrc/common/weapons/w_machinegun.qc +++ b/qcsrc/common/weapons/w_machinegun.qc @@ -304,11 +304,7 @@ float w_uzi(float req) precache_model ("models/weapons/v_uzi.md3"); precache_model ("models/weapons/h_uzi.iqm"); precache_sound ("weapons/uzi_fire.wav"); - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_UZI,weapon,prop,name) - UZI_SETTINGS(uzi) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(UZI_SETTINGS(uzi), WEP_UZI) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc index 811d18fa4..3469e3f7c 100644 --- a/qcsrc/common/weapons/w_minelayer.qc +++ b/qcsrc/common/weapons/w_minelayer.qc @@ -532,11 +532,7 @@ float w_minelayer(float req) precache_sound ("weapons/mine_fire.wav"); precache_sound ("weapons/mine_stick.wav"); precache_sound ("weapons/mine_trigger.wav"); - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_MINE_LAYER,weapon,prop,name) - MINELAYER_SETTINGS(minelayer) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(MINELAYER_SETTINGS(minelayer), WEP_MINE_LAYER) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc index 73e3c2210..aff2122dc 100644 --- a/qcsrc/common/weapons/w_mortar.qc +++ b/qcsrc/common/weapons/w_mortar.qc @@ -386,12 +386,7 @@ float w_glauncher(float req) precache_sound ("weapons/grenade_bounce6.wav"); precache_sound ("weapons/grenade_stick.wav"); precache_sound ("weapons/grenade_fire.wav"); - - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_GRENADE_LAUNCHER,weapon,prop,name) - MORTAR_SETTINGS(mortar) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(MORTAR_SETTINGS(mortar), WEP_GRENADE_LAUNCHER) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc index 44bf35926..135111898 100644 --- a/qcsrc/common/weapons/w_nex.qc +++ b/qcsrc/common/weapons/w_nex.qc @@ -241,11 +241,7 @@ float w_nex(float req) precache_sound ("weapons/nexwhoosh1.wav"); precache_sound ("weapons/nexwhoosh2.wav"); precache_sound ("weapons/nexwhoosh3.wav"); - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_NEX,weapon,prop,name) - NEX_SETTINGS(nex) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(NEX_SETTINGS(nex), WEP_NEX) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc index 6706266d1..9ca3fdda0 100644 --- a/qcsrc/common/weapons/w_porto.qc +++ b/qcsrc/common/weapons/w_porto.qc @@ -372,11 +372,7 @@ float w_porto(float req) precache_sound ("porto/explode.wav"); precache_sound ("porto/fire.wav"); precache_sound ("porto/unsupported.wav"); - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_PORTO,weapon,prop,name) - PORTO_SETTINGS(porto) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(PORTO_SETTINGS(porto), WEP_PORTO) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc index 404a1f0b2..abcf6c694 100644 --- a/qcsrc/common/weapons/w_rifle.qc +++ b/qcsrc/common/weapons/w_rifle.qc @@ -205,11 +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"); - #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/ - #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_RIFLE,weapon,prop,name) - RIFLE_SETTINGS(rifle) - #undef WEP_ADD_CVAR - #undef WEP_ADD_PROP + WEP_SET_PROPS(RIFLE_SETTINGS(rifle), WEP_RIFLE) return TRUE; } case WR_SETUP: diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh index bfb1964dd..a4ced87a9 100644 --- a/qcsrc/common/weapons/weapons.qh +++ b/qcsrc/common/weapons/weapons.qh @@ -309,6 +309,13 @@ float WEP_LAST; #define WEP_SET_PROP(wepid,weapon,prop,name) get_weaponinfo(##wepid).##prop = autocvar_g_balance_##weapon##_##name; +#define WEP_SET_PROPS(wepsettings,wepid) \ + #define WEP_ADD_CVAR(weapon,mode,name) \ + #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(wepid,weapon,prop,name) \ + wepsettings \ + #undef WEP_ADD_CVAR \ + #undef WEP_ADD_PROP + #include "all.qh" #undef WEP_ADD_CVAR -- 2.39.2