From deb80a0564de841cd6493b0153005a6d86d83dde Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Tue, 10 Dec 2013 20:11:02 -0500 Subject: [PATCH] Cleanup cvar handling a bit --- qcsrc/common/weapons/config.qh | 24 ++++++------------------ qcsrc/common/weapons/weapons.qh | 12 +++++++----- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh index 552224f1a..6a0489314 100644 --- a/qcsrc/common/weapons/config.qh +++ b/qcsrc/common/weapons/config.qh @@ -18,29 +18,17 @@ string wep_config_queue[MAX_WEP_CONFIG]; fputs(wep_config_file, a); \ if(wep_config_alsoprint) { print(a); } } -#define WEP_CONFIG_WRITE_CVARS_PRI(wepname,name) \ - { WEP_CONFIG_QUEUE( \ - sprintf("set g_balance_%s_primary_%s %g\n", #wepname, #name, \ - cvar(sprintf("g_balance_%s_primary_%s", #wepname, #name)))) } - -#define WEP_CONFIG_WRITE_CVARS_SEC(wepname,name) \ - { WEP_CONFIG_QUEUE( \ - sprintf("set g_balance_%s_secondary_%s %g\n", #wepname, #name, \ - cvar(sprintf("g_balance_%s_secondary_%s", #wepname, #name)))) } - -#define WEP_CONFIG_WRITE_CVARS_BOTH(wepname,name) \ - { WEP_CONFIG_QUEUE( \ - sprintf("set g_balance_%s_primary_%s %g\n", #wepname, #name, \ - cvar(sprintf("g_balance_%s_primary_%s", #wepname, #name)))) } \ - { WEP_CONFIG_QUEUE( \ - sprintf("set g_balance_%s_secondary_%s %g\n", #wepname, #name, \ - cvar(sprintf("g_balance_%s_secondary_%s", #wepname, #name)))) } - #define WEP_CONFIG_WRITE_CVARS_NONE(wepname,name) \ { WEP_CONFIG_QUEUE( \ sprintf("set g_balance_%s_%s %g\n", #wepname, #name, \ cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) } +#define WEP_CONFIG_WRITE_CVARS_PRI(wepname,name) WEP_CONFIG_WRITE_CVARS_NONE(wepname, primary_##name) +#define WEP_CONFIG_WRITE_CVARS_SEC(wepname,name) WEP_CONFIG_WRITE_CVARS_NONE(wepname, secondary_##name) +#define WEP_CONFIG_WRITE_CVARS_BOTH(wepname,name) \ + WEP_CONFIG_WRITE_CVARS_PRI(wepname, name) \ + WEP_CONFIG_WRITE_CVARS_SEC(wepname, name) + #define WEP_CONFIG_WRITE_CVARS(wepid,wepname,mode,name) WEP_CONFIG_WRITE_CVARS_##mode(wepname, name) #define WEP_CONFIG_WRITE_PROPS_string(wepname,name) \ diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh index bb4c0dd0b..007892e71 100644 --- a/qcsrc/common/weapons/weapons.qh +++ b/qcsrc/common/weapons/weapons.qh @@ -149,12 +149,14 @@ float W_AmmoItemCode(float wpn); // ===================== // create cvars for weapon settings -#define WEP_ADD_CVAR_PRI(wepname,name) final float autocvar_g_balance_##wepname##_primary_##name; -#define WEP_ADD_CVAR_SEC(wepname,name) final float autocvar_g_balance_##wepname##_secondary_##name; -#define WEP_ADD_CVAR_BOTH(wepname,name) \ - final float autocvar_g_balance_##wepname##_primary_##name; \ - final float autocvar_g_balance_##wepname##_secondary_##name; #define WEP_ADD_CVAR_NONE(wepname,name) final float autocvar_g_balance_##wepname##_##name; + +#define WEP_ADD_CVAR_PRI(wepname,name) WEP_ADD_CVAR_NONE(wepname, primary_##name) +#define WEP_ADD_CVAR_SEC(wepname,name) WEP_ADD_CVAR_NONE(wepname, secondary_##name) +#define WEP_ADD_CVAR_BOTH(wepname,name) \ + WEP_ADD_CVAR_PRI(wepname, name) \ + WEP_ADD_CVAR_SEC(wepname, name) + #define WEP_ADD_CVAR(wepid,wepname,mode,name) WEP_ADD_CVAR_##mode(wepname, name) // create properties for weapon settings -- 2.39.2