Add config support to Arc, Crylink, Hagar, Mortar, and Nex

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index 62d6c68b9b0a91b468667beb3e51c1f55bd957b8..c8b05fb02690e7aa23017a5689e501d8cd18583f 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -262,6 +262,15 @@ float w_arc(float req)
                {
                        return self.ammo_cells >= WEP_CVAR_SEC(arc, ammo);
                }
+               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
+                       return TRUE;
+               }
                case WR_KILLMESSAGE:
                {
                        if(w_deathtype & HITTYPE_SECONDARY)

diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc
index b634d3a922e21c1493ccbd76a744c05af08e6781..a8579c5206301e56407cbd02ff3ba8dfa2c55c47 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -668,6 +668,15 @@ float w_crylink(float req)
                        ammo_amount += self.(weapon_load[WEP_CRYLINK]) >= autocvar_g_balance_crylink_secondary_ammo;
                        return ammo_amount;
                }
+               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
+                       return TRUE;
+               }
                case WR_RELOAD:
                {
                        W_Reload(min(autocvar_g_balance_crylink_primary_ammo, autocvar_g_balance_crylink_secondary_ammo), autocvar_g_balance_crylink_reload_ammo, autocvar_g_balance_crylink_reload_time, "weapons/reload.wav");

diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc
index 292dfb8623c8d187eea1d3f9d827b0cd22a325b7..c947cf905526603ab499217d437dc19fcc1c49c0 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -469,16 +469,6 @@ float W_Devastator(float req)
                        ARC_SETTINGS(devastator)
                        #undef WEP_ADD_CVAR
                        #undef WEP_ADD_PROP
-                       
-                       return TRUE;
-               }
-               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
                        return TRUE;
                }
                case WR_SETUP:
@@ -510,6 +500,15 @@ float W_Devastator(float req)
                {
                        return FALSE;
                }
+               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
+                       return TRUE;
+               }
                case WR_RESETPLAYER:
                {
                        self.rl_release = 0;

diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc
index cb1d1719061e0f7f9999e0f314321a3ded1c23d3..01eb8d4b99bbe3bf8f6549005861e1c876976174 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -476,6 +476,15 @@ float w_hagar(float req)
                        ammo_amount += self.(weapon_load[WEP_HAGAR]) >= WEP_CVAR_SEC(hagar, ammo);
                        return ammo_amount;
                }
+               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
+                       return TRUE;
+               }
                case WR_RESETPLAYER:
                {
                        self.hagar_load = 0;

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index f6bdc9e9b62066a803562cc0595060be1a10d9f2..d3eda2d9422748d5ffe93378a2ee068ca15d9a54 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -412,6 +412,15 @@ float w_glauncher(float req)
                        ammo_amount += self.(weapon_load[WEP_GRENADE_LAUNCHER]) >= WEP_CVAR_SEC(mortar, ammo);
                        return ammo_amount;
                }
+               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
+                       return TRUE;
+               }
                case WR_RELOAD:
                {
                        W_Reload(min(WEP_CVAR_PRI(mortar, ammo), WEP_CVAR_SEC(mortar, ammo)), autocvar_g_balance_mortar_reload_ammo, autocvar_g_balance_mortar_reload_time, "weapons/reload.wav"); // WEAPONTODO

diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc
index 5e9a3e2a4f23b19b8b77cda85336abd3066efefb..3cc9abc11e256d8a6fb2aaa0c5659dcc3905e61d 100644 (file)
--- a/qcsrc/common/weapons/w_nex.qc
+++ b/qcsrc/common/weapons/w_nex.qc
@@ -274,6 +274,15 @@ float w_nex(float req)
                                return FALSE; // zoom is not a fire mode
                        }
                }
+               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
+                       return TRUE;
+               }
                case WR_RELOAD:
                {
                        W_Reload(min(WEP_CVAR_PRI(nex, ammo), WEP_CVAR_SEC(nex, ammo)), autocvar_g_balance_nex_reload_ammo, autocvar_g_balance_nex_reload_time, "weapons/reload.wav");