Clean up some more macros (sort of :D)

diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc
index 47bfe2e21896d5ce96540ec7fd249a663c7d55a6..078224365c2463bff836717d792f5b22934fb15f 100644 (file)
--- a/qcsrc/common/weapons/config.qc
+++ b/qcsrc/common/weapons/config.qc
@@ -42,10 +42,10 @@ void Dump_Weapon_Settings(void)
                heapsort(WEP_CONFIG_COUNT, W_Config_Queue_Swap, W_Config_Queue_Compare, world);
                
                // step 4: write queue
-               WEP_CONFIG_WRITE(sprintf("// {{{ #%d: %s\n// %d settings\n", i, W_Name(i), WEP_CONFIG_COUNT))
+               WEP_CONFIG_WRITETOFILE(sprintf("// {{{ #%d: %s\n// %d settings\n", i, W_Name(i), WEP_CONFIG_COUNT))
                for(x = 0; x <= WEP_CONFIG_COUNT; ++x)
-                       { WEP_CONFIG_WRITE(wep_config_queue[x]) }
-               WEP_CONFIG_WRITE("// }}}\n")
+                       { WEP_CONFIG_WRITETOFILE(wep_config_queue[x]) }
+               WEP_CONFIG_WRITETOFILE("// }}}\n")
        }
 }
        /*

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index b2dd89f390122fbde61d4b1d49688770c6e731fe..12ce34078a877a0d8f5068a2eefdb905a7a9a111 100644 (file)
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -14,7 +14,7 @@ string wep_config_queue[MAX_WEP_CONFIG];
        wep_config_queue[WEP_CONFIG_COUNT] = a; \
        ++WEP_CONFIG_COUNT; }
 
-#define WEP_CONFIG_WRITE(a) { \
+#define WEP_CONFIG_WRITETOFILE(a) { \
        fputs(wep_config_file, a); \
        if(wep_config_alsoprint) { print(a); } }
 
@@ -55,3 +55,10 @@ string wep_config_queue[MAX_WEP_CONFIG];
                        #weapon, \
                        #name, \
                        autocvar_g_balance_##weapon##_##name)) } 
+
+#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) \
+       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 10c7c262e76e8bc51e19eb70d777a7786e298520..f7944ae0dc968a1fd12e76fc28f8a9cb2de8548f 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -264,11 +264,7 @@ float w_arc(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       ARC_SETTINGS(arc)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(ARC_SETTINGS(arc))
                        return TRUE;
                }
                case WR_KILLMESSAGE:

diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc
index 443362cb821fcac0282819b901485c43962a02d5..e12fae8adb5b7edca390506d2fbb7cc07e041175 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -670,11 +670,7 @@ float w_crylink(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       CRYLINK_SETTINGS(crylink)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(CRYLINK_SETTINGS(crylink))
                        return TRUE;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc
index 4bee14be9178ff14430a9eaafb6a4151f0d6fae9..12d7cdb830f0a3477e3caf892ba8c9a6c6366259 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -503,11 +503,7 @@ float W_Devastator(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       DEVASTATOR_SETTINGS(devastator)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(DEVASTATOR_SETTINGS(devastator))
                        return TRUE;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc
index f2a558fc295f2b197bbe109efda8f7c0310938f0..19879ac860be910c4f566419124b073df39ec2c9 100644 (file)
--- a/qcsrc/common/weapons/w_fireball.qc
+++ b/qcsrc/common/weapons/w_fireball.qc
@@ -416,11 +416,7 @@ float w_fireball(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       FIREBALL_SETTINGS(fireball)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(FIREBALL_SETTINGS(fireball))
                        return TRUE;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc
index fe183e60612273480978c2311d699dcb25197196..711f5b531e0f5723cbb3fd9ce86f4eed655d6c48 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -477,11 +477,7 @@ float w_hagar(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       HAGAR_SETTINGS(hagar)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(HAGAR_SETTINGS(hagar))
                        return TRUE;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc
index 6d4c39fee903a130525e6843b185be8e28be733b..4c277069d5a19460126953310bb25f168ee2b555 100644 (file)
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -313,11 +313,7 @@ float w_hook(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       HOOK_SETTINGS(hook)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(HOOK_SETTINGS(hook))
                        return TRUE;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc
index cc12a99ced8ae4e0aa0637f50e9499db683db2b7..d84c2b14d44c52c09c857de3cf5d7917916a3814 100644 (file)
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -351,11 +351,7 @@ float w_uzi(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       UZI_SETTINGS(uzi)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(UZI_SETTINGS(uzi))
                        return TRUE;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc
index 931d599dcd3d4085eacce63c8053146d7bf359da..811d18fa4545b953811fba7532665fa1ee3bbca3 100644 (file)
--- a/qcsrc/common/weapons/w_minelayer.qc
+++ b/qcsrc/common/weapons/w_minelayer.qc
@@ -565,11 +565,7 @@ float w_minelayer(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       MINELAYER_SETTINGS(minelayer)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(MINELAYER_SETTINGS(minelayer))
                        return TRUE;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index 9fcefa174a4260ad117a0fdaad7fbae095e5468d..73e3c2210700877db29c08169b9973332582784e 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -414,11 +414,7 @@ float w_glauncher(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       MORTAR_SETTINGS(mortar)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(MORTAR_SETTINGS(mortar))
                        return TRUE;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc
index dcabbc586a0804cda85989d6755731a5c347cdec..44bf35926a5e9f14584fe577f404a839932e332d 100644 (file)
--- a/qcsrc/common/weapons/w_nex.qc
+++ b/qcsrc/common/weapons/w_nex.qc
@@ -276,11 +276,7 @@ float w_nex(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       NEX_SETTINGS(nex)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(NEX_SETTINGS(nex))
                        return TRUE;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc
index a0eb6cc0ee377fd670beb86f400314c9d1f1a655..6706266d1579453b9745fdb8533e982d756e3fb7 100644 (file)
--- a/qcsrc/common/weapons/w_porto.qc
+++ b/qcsrc/common/weapons/w_porto.qc
@@ -299,11 +299,7 @@ float w_porto(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       PORTO_SETTINGS(porto)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(PORTO_SETTINGS(porto))
                        return TRUE;
                }
                case WR_THINK:

diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc
index a7c7e262e94031106ee4b53965a820128f68a372..404a1f0b2555fd8baf3bc7c4d0b8bb2ead2352b6 100644 (file)
--- a/qcsrc/common/weapons/w_rifle.qc
+++ b/qcsrc/common/weapons/w_rifle.qc
@@ -232,11 +232,7 @@ float w_rifle(float req)
                }
                case WR_CONFIG:
                {
-                       #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)
-                       RIFLE_SETTINGS(rifle)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       WEP_CONFIG_SETTINGS(RIFLE_SETTINGS(rifle))
                        return TRUE;
                }
                case WR_RESETPLAYER: