Even more cleanup (sort of)

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index 12ce34078a877a0d8f5068a2eefdb905a7a9a111..316da5fa68f45a254f6b3af1cff45f0ac03ef997 100644 (file)
--- 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 f7944ae0dc968a1fd12e76fc28f8a9cb2de8548f..09ba8b67f64e5805e2dc7089b9f1869c9d089d6f 100644 (file)
--- 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 e12fae8adb5b7edca390506d2fbb7cc07e041175..8a107636c27b0666bd49fd22cf6b61ccd7ea1a86 100644 (file)
--- 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 12d7cdb830f0a3477e3caf892ba8c9a6c6366259..347652ef4f8bf4aa6f8b1078735d338fb1ab6644 100644 (file)
--- 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 19879ac860be910c4f566419124b073df39ec2c9..a45f083321101acb1901c95dcc905466a329007d 100644 (file)
--- 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 711f5b531e0f5723cbb3fd9ce86f4eed655d6c48..779333d87792df7569b638888ed134f5295dbf69 100644 (file)
--- 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 4c277069d5a19460126953310bb25f168ee2b555..a9f2bad8f4fa4308869820f209e5b242aa5a7ce3 100644 (file)
--- 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 d84c2b14d44c52c09c857de3cf5d7917916a3814..216f55397860bc9b542718168b5b9f6202d6e20e 100644 (file)
--- 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 811d18fa4545b953811fba7532665fa1ee3bbca3..3469e3f7c562d10a9d56532d6d83cce0223461df 100644 (file)
--- 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 73e3c2210700877db29c08169b9973332582784e..aff2122dc61a01310f4aa5e401f27119cceabfdc 100644 (file)
--- 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 44bf35926a5e9f14584fe577f404a839932e332d..1351118985458c6be8f2c8025d0e9a0395535857 100644 (file)
--- 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 6706266d1579453b9745fdb8533e982d756e3fb7..9ca3fdda037f25d87d98e53fdd51a6b828990d3d 100644 (file)
--- 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 404a1f0b2555fd8baf3bc7c4d0b8bb2ead2352b6..abcf6c694b20614b05555f9704b3eb831c0dd173 100644 (file)
--- 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 bfb1964dd99026b8f8b9388c97ea712326b38991..a4ced87a9b990055ba8a30a55ef7b3916187f720 100644 (file)
--- 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