Don't do the full WEP_id for these, not necessary

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index 1ed5faae20e14a3b62166759b45aee10f42f8539..6ce4a90d0b0fbf0429e57b15377522ae4bdcf53f 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Arc")
 );
 
-#define ARC_SETTINGS(w_cvar,w_prop) ARC_SETTINGS_LIST(w_cvar, w_prop, WEP_ARC, arc)
+#define ARC_SETTINGS(w_cvar,w_prop) ARC_SETTINGS_LIST(w_cvar, w_prop, ARC, arc)
 #define ARC_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, ammo) \
        w_cvar(id, sn, MO_PRI,  animtime) \

diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc
index cd8ba5d207772ed3ab4c978beb692174a48b8ab6..24cc175d8170af2305062338a63585ea503345f1 100644 (file)
--- a/qcsrc/common/weapons/w_blaster.qc
+++ b/qcsrc/common/weapons/w_blaster.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Blaster")
 );
 
-#define BLASTER_SETTINGS(w_cvar,w_prop) BLASTER_SETTINGS_LIST(w_cvar, w_prop, WEP_BLASTER, blaster)
+#define BLASTER_SETTINGS(w_cvar,w_prop) BLASTER_SETTINGS_LIST(w_cvar, w_prop, BLASTER, blaster)
 #define BLASTER_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, animtime) \
        w_cvar(id, sn, MO_BOTH, damage) \

diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc
index a47feb19a2181b4b5962fd46b2fcb5eee0c4267d..8d25c6b7e2ba78623c8bafac1bcf9a5da0b27c0a 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Crylink")
 );
 
-#define CRYLINK_SETTINGS(w_cvar,w_prop) CRYLINK_SETTINGS_LIST(w_cvar, w_prop, WEP_CRYLINK, crylink)
+#define CRYLINK_SETTINGS(w_cvar,w_prop) CRYLINK_SETTINGS_LIST(w_cvar, w_prop, CRYLINK, crylink)
 #define CRYLINK_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, ammo) \
        w_cvar(id, sn, MO_BOTH, animtime) \

diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc
index e9833f598021df0d59a4a2f0e7ef60fddfd3f478..43e5359acf795d940be33eab0f9316372f7ed6cc 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Devastator")
 );
 
-#define DEVASTATOR_SETTINGS(w_cvar,w_prop) DEVASTATOR_SETTINGS_LIST(w_cvar, w_prop, WEP_DEVASTATOR, devastator)
+#define DEVASTATOR_SETTINGS(w_cvar,w_prop) DEVASTATOR_SETTINGS_LIST(w_cvar, w_prop, DEVASTATOR, devastator)
 #define DEVASTATOR_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_NONE, ammo) \
        w_cvar(id, sn, MO_NONE, animtime) \

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index 4982e051e19533896a420cff88084be211d8bf03..47bffb0af4e4d811477301ff61ae44c7d396ede7 100644 (file)
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Electro")
 );
 
-#define ELECTRO_SETTINGS(w_cvar,w_prop) ELECTRO_SETTINGS_LIST(w_cvar, w_prop, WEP_ELECTRO, electro)
+#define ELECTRO_SETTINGS(w_cvar,w_prop) ELECTRO_SETTINGS_LIST(w_cvar, w_prop, ELECTRO, electro)
 #define ELECTRO_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, ammo) \
        w_cvar(id, sn, MO_BOTH, animtime) \

diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc
index a3a144279a9e90663c768e451da19eca4940d95f..83b69a7008d82f0a68977522f01bbab691dd7335 100644 (file)
--- a/qcsrc/common/weapons/w_fireball.qc
+++ b/qcsrc/common/weapons/w_fireball.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Fireball")
 );
 
-#define FIREBALL_SETTINGS(w_cvar,w_prop) FIREBALL_SETTINGS_LIST(w_cvar, w_prop, WEP_FIREBALL, fireball)
+#define FIREBALL_SETTINGS(w_cvar,w_prop) FIREBALL_SETTINGS_LIST(w_cvar, w_prop, FIREBALL, fireball)
 #define FIREBALL_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, animtime) \
        w_cvar(id, sn, MO_BOTH, refire) \

diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc
index ef334d9df4c7204b1990184ab464e29472641b37..02554970cf3138e4cd502e07a5117b5ace0bb4d7 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Hagar")
 );
 
-#define HAGAR_SETTINGS(w_cvar,w_prop) HAGAR_SETTINGS_LIST(w_cvar, w_prop, WEP_HAGAR, hagar)
+#define HAGAR_SETTINGS(w_cvar,w_prop) HAGAR_SETTINGS_LIST(w_cvar, w_prop, HAGAR, hagar)
 #define HAGAR_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, ammo) \
        w_cvar(id, sn, MO_BOTH, damage) \

diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc
index b49274c65178aabc29e3b445551f7a0de1213aab..509a0eabbfa230350ee0da60a9ef9f11bdf24d24 100644 (file)
--- a/qcsrc/common/weapons/w_hlac.qc
+++ b/qcsrc/common/weapons/w_hlac.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Heavy Laser Assault Cannon")
 );
 
-#define HLAC_SETTINGS(w_cvar,w_prop) HLAC_SETTINGS_LIST(w_cvar, w_prop, WEP_HLAC, hlac)
+#define HLAC_SETTINGS(w_cvar,w_prop) HLAC_SETTINGS_LIST(w_cvar, w_prop, HLAC, hlac)
 #define HLAC_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, ammo) \
        w_cvar(id, sn, MO_BOTH, animtime) \

diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc
index a45fa6b5db88788425d4d9bc262ca6cc6382ee08..3deabd127ff64afe9df431eacf89a7c836a1f8a3 100644 (file)
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Grappling Hook")
 );
 
-#define HOOK_SETTINGS(w_cvar,w_prop) HOOK_SETTINGS_LIST(w_cvar, w_prop, WEP_HOOK, hook)
+#define HOOK_SETTINGS(w_cvar,w_prop) HOOK_SETTINGS_LIST(w_cvar, w_prop, HOOK, hook)
 #define HOOK_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, animtime) \
        w_cvar(id, sn, MO_BOTH, ammo) \

diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc
index f2c28d771f4a93c0b609b8ad7b06c932a3903096..a8e5a756b247dd3970acc1ed77be28bcf3d33bba 100644 (file)
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Machine Gun")
 );
 
-#define UZI_SETTINGS(w_cvar,w_prop) UZI_SETTINGS_LIST(w_cvar, w_prop, WEP_UZI, uzi)
+#define UZI_SETTINGS(w_cvar,w_prop) UZI_SETTINGS_LIST(w_cvar, w_prop, UZI, uzi)
 #define UZI_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_NONE, speed) \
        w_cvar(id, sn, MO_NONE, spread_min) \

diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc
index ec6d8bcc4490a96357639c6a483e06a63ae4d99e..49d2605b428c5c6c48859e7898491be2e4ad5ef8 100644 (file)
--- a/qcsrc/common/weapons/w_minelayer.qc
+++ b/qcsrc/common/weapons/w_minelayer.qc
@@ -10,7 +10,8 @@ REGISTER_WEAPON(
 /* netname  */ "minelayer",
 /* fullname */ _("Mine Layer")
 );
-#define MINELAYER_SETTINGS(w_cvar,w_prop) MINELAYER_SETTINGS_LIST(w_cvar, w_prop, WEP_MINE_LAYER, minelayer)
+
+#define MINELAYER_SETTINGS(w_cvar,w_prop) MINELAYER_SETTINGS_LIST(w_cvar, w_prop, MINE_LAYER, minelayer)
 #define MINELAYER_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_NONE, ammo) \
        w_cvar(id, sn, MO_NONE, animtime) \

diff --git a/qcsrc/common/weapons/w_minstanex.qc b/qcsrc/common/weapons/w_minstanex.qc
index a8e238197c84a284b972d5d4a78f863495f4a4e5..2869128dc1c3cb837788f4f72ae0752d0b590f50 100644 (file)
--- a/qcsrc/common/weapons/w_minstanex.qc
+++ b/qcsrc/common/weapons/w_minstanex.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("MinstaNex")
 );
 
-#define MINSTANEX_SETTINGS(w_cvar,w_prop) MINSTANEX_SETTINGS_LIST(w_cvar, w_prop, WEP_MINSTANEX, minstanex)
+#define MINSTANEX_SETTINGS(w_cvar,w_prop) MINSTANEX_SETTINGS_LIST(w_cvar, w_prop, MINSTANEX, minstanex)
 #define MINSTANEX_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_PRI, ammo) \
        w_cvar(id, sn, MO_PRI, animtime) \

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index dc61caa78aa89a24984fd03486a7d4c4aaa12733..3ac46814c5677e8d8f25ab831e57f7d83f40bb69 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Mortar")
 );
 
-#define MORTAR_SETTINGS(w_cvar,w_prop) MORTAR_SETTINGS_LIST(w_cvar, w_prop, WEP_MORTAR, mortar)
+#define MORTAR_SETTINGS(w_cvar,w_prop) MORTAR_SETTINGS_LIST(w_cvar, w_prop, MORTAR, mortar)
 #define MORTAR_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, ammo) \
        w_cvar(id, sn, MO_BOTH, animtime) \

diff --git a/qcsrc/common/weapons/w_nex.qc b/qcsrc/common/weapons/w_nex.qc
index 9c364113b674d8cfe5d631f608d88339f7e9dd37..b36da57d7e775ba54114455364b57089ff77c407 100644 (file)
--- a/qcsrc/common/weapons/w_nex.qc
+++ b/qcsrc/common/weapons/w_nex.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Nex")
 );
 
-#define NEX_SETTINGS(w_cvar,w_prop) NEX_SETTINGS_LIST(w_cvar, w_prop, WEP_NEX, nex)
+#define NEX_SETTINGS(w_cvar,w_prop) NEX_SETTINGS_LIST(w_cvar, w_prop, NEX, nex)
 #define NEX_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, ammo) \
        w_cvar(id, sn, MO_BOTH, animtime) \

diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc
index c11f2e640be2195c01ac205fc365b9c01d35afc9..b22e5471d20317e5f58ed82fdeb97c080e703683 100644 (file)
--- a/qcsrc/common/weapons/w_porto.qc
+++ b/qcsrc/common/weapons/w_porto.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Port-O-Launch")
 );
 
-#define PORTO_SETTINGS(w_cvar,w_prop) PORTO_SETTINGS_LIST(w_cvar, w_prop, WEP_PORTO, porto)
+#define PORTO_SETTINGS(w_cvar,w_prop) PORTO_SETTINGS_LIST(w_cvar, w_prop, PORTO, porto)
 #define PORTO_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, animtime) \
        w_cvar(id, sn, MO_BOTH, lifetime) \

diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc
index a7433b47cd151b8ca2cf2322043028debc177d45..4248747687b86da5632869f3e7344786ed4bc806 100644 (file)
--- a/qcsrc/common/weapons/w_rifle.qc
+++ b/qcsrc/common/weapons/w_rifle.qc
@@ -10,7 +10,8 @@ REGISTER_WEAPON(
 /* netname  */ "rifle",
 /* fullname */ _("Rifle")
 );
-#define RIFLE_SETTINGS(w_cvar,w_prop) RIFLE_SETTINGS_LIST(w_cvar, w_prop, WEP_RIFLE, rifle)
+
+#define RIFLE_SETTINGS(w_cvar,w_prop) RIFLE_SETTINGS_LIST(w_cvar, w_prop, RIFLE, rifle)
 #define RIFLE_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_BOTH, ammo) \
        w_cvar(id, sn, MO_BOTH, animtime) \

diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc
index 9444723aec6a63bc53c7322dda05eb010c7d6c4f..63385c67a040a9cf4922854a7495845d441acacc 100644 (file)
--- a/qcsrc/common/weapons/w_seeker.qc
+++ b/qcsrc/common/weapons/w_seeker.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("T.A.G. Seeker")
 );
 
-#define SEEKER_SETTINGS(w_cvar,w_prop) SEEKER_SETTINGS_LIST(w_cvar, w_prop, WEP_SEEKER, seeker)
+#define SEEKER_SETTINGS(w_cvar,w_prop) SEEKER_SETTINGS_LIST(w_cvar, w_prop, SEEKER, seeker)
 #define SEEKER_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_NONE, type) \
        w_cvar(id, sn, MO_NONE, flac_ammo) \

diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc
index d859f62e815c45c785741cef80c4ac991887cacd..d06fd443f0b6ba12eb21ba0417784e781f61b633 100644 (file)
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -11,7 +11,7 @@ REGISTER_WEAPON(
 /* fullname */ _("Shockwave")
 );
 
-#define SHOCKWAVE_SETTINGS(w_cvar,w_prop) SHOCKWAVE_SETTINGS_LIST(w_cvar, w_prop, WEP_SHOCKWAVE, shockwave)
+#define SHOCKWAVE_SETTINGS(w_cvar,w_prop) SHOCKWAVE_SETTINGS_LIST(w_cvar, w_prop, SHOCKWAVE, shockwave)
 #define SHOCKWAVE_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_NONE, blast_damage) \
        w_cvar(id, sn, MO_NONE, blast_distance) \

diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc
index 08d5e9d9694b282f9f2ca7bae768ee1652eb11dc..a68ba575af8dcb450be7b5ad98db70b515796ce1 100644 (file)
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -12,7 +12,7 @@ REGISTER_WEAPON(
 /* fullname  */ _("@!#%'n Tuba")
 );
 
-#define TUBA_SETTINGS(w_cvar,w_prop) TUBA_SETTINGS_LIST(w_cvar, w_prop, WEP_TUBA, tuba)
+#define TUBA_SETTINGS(w_cvar,w_prop) TUBA_SETTINGS_LIST(w_cvar, w_prop, TUBA, tuba)
 #define TUBA_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
        w_cvar(id, sn, MO_NONE, animtime) \
        w_cvar(id, sn, MO_NONE, attenuation) \

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index 1982f047c109b15ac094da6928ccc0465adcd18a..bf768411c9045edb3009d5ecfe8a74845cec3932 100644 (file)
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -169,7 +169,7 @@ float W_AmmoItemCode(float wpn);
 
 // set initialization values for weapon settings
 #define WEP_SKIPCVAR(unuseda,unusedb,unusedc,unusedd) /* skip cvars */
-#define WEP_SET_PROP(wepid,wepname,type,prop,name) get_weaponinfo(##wepid).##prop = autocvar_g_balance_##wepname##_##name;
+#define WEP_SET_PROP(wepid,wepname,type,prop,name) get_weaponinfo(WEP_##wepid).##prop = autocvar_g_balance_##wepname##_##name;
 
 float w_null(float dummy);
 void register_weapon(float id, WepSet bit, float(float) func, float ammotype, float i, float weapontype, float pickupbasevalue, string modelname, string shortname, string wname);