Actually we can do another macro there too :D

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index aef5729dc0ad47bc136fb4b99f98ea06301aa4c6..1be09717e1962f0fb9151463fd0737f05c46e14b 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -294,7 +294,7 @@ void ArcInit()
        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) get_weaponinfo(WEP_ARC).##prop = autocvar_g_balance_##weapon##_##name;
+       #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

diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc
index 351babfd44a5b7724582331d9be4e5a6cb45b9e8..acc66393a50208f53b3b3973df748385ef96174c 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -636,7 +636,7 @@ float w_crylink(float req)
                        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) get_weaponinfo(WEP_CRYLINK).##prop = autocvar_g_balance_##weapon##_##name;
+                       #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

diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc
index e30c8746e30edb2f2c2c6c57040b089e97083e62..5f889b75e2819077a93a49ab81e53003663bc2a0 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -465,7 +465,7 @@ float W_Devastator(float req)
                        }
 
                        #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/
-                       #define WEP_ADD_PROP(weapon,prop,name) get_weaponinfo(WEP_DEVASTATOR).##prop = autocvar_g_balance_##weapon##_##name;
+                       #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

diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc
index 7d8f3d58cf5b665523f05176e2bf0c8fc45c984e..96277ef240dc9f5a3bbcbe8dc68ab1ff915146e9 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -444,7 +444,7 @@ float w_hagar(float req)
                        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) get_weaponinfo(WEP_HAGAR).##prop = autocvar_g_balance_##weapon##_##name;
+                       #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

diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc
index fe9009412844c338a5e463dc35b2dbd7efa1e2e0..2b92a8da99033e6033c3679ec38f153c72ebce97 100644 (file)
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -305,7 +305,7 @@ float w_uzi(float req)
                        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) get_weaponinfo(WEP_UZI).##prop = autocvar_g_balance_##weapon##_##name;
+                       #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

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index f4b93052bd332bb9105a44347ff444988d753c55..aa72c88e6f107213b2c44a9192026f4b8fcca448 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -388,7 +388,7 @@ float w_glauncher(float req)
                        precache_sound ("weapons/grenade_fire.wav");
 
                        #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/
-                       #define WEP_ADD_PROP(weapon,prop,name) get_weaponinfo(WEP_GRENADE_LAUNCHER).##prop = autocvar_g_balance_##weapon##_##name;
+                       #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

diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc
index 53b7a1c04aa8f37b66f7fce1abf41896f305916a..821f9e2ecf6de4a5798129f38a7cc79a0aec03a2 100644 (file)
--- a/qcsrc/common/weapons/w_nex.qc
+++ b/qcsrc/common/weapons/w_nex.qc
@@ -242,7 +242,7 @@ float w_nex(float req)
                        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) get_weaponinfo(WEP_NEX).##prop = autocvar_g_balance_##weapon##_##name;
+                       #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

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index 4bf4a694b449bb9341e6f5de4201556e9c2accea..d59bf7a4dad33c1dfe41fcf45e7257455aa370d7 100644 (file)
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -292,6 +292,8 @@ float WEP_LAST;
        .float ##prop; \
        float autocvar_g_balance_##weapon##_##name;
 
+#define WEP_SET_PROP(wepid,weapon,prop,name) get_weaponinfo(##wepid).##prop = autocvar_g_balance_##weapon##_##name;
+
 #include "all.qh"
 
 #undef WEP_ADD_CVAR