Simplify REGISTER_WEAPON (and avoid adding redundant globals), now possible thanks...

diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qh b/qcsrc/common/mutators/mutator/overkill/okhmg.qh
index c4e140234c482fc31e09012069b69d8608206570..46dcff4509107e8742f8fded9859c8b57573b7bb 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okhmg.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qh
@@ -59,7 +59,7 @@ CLASS(OverkillHeavyMachineGun, Weapon)
 #undef X
 
 ENDCLASS(OverkillHeavyMachineGun)
-REGISTER_WEAPON(OVERKILL_HMG, okhmg, NEW(OverkillHeavyMachineGun));
+REGISTER_WEAPON(OVERKILL_HMG, NEW(OverkillHeavyMachineGun));
 
 //SPAWNFUNC_WEAPON(weapon_okhmg, WEP_OVERKILL_HMG)
 //SPAWNFUNC_WEAPON(weapon_hmg, WEP_OVERKILL_HMG)

diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
index 5ec40b7f73b14f79803dc61dc8258813a2655b6d..c274a8fb5778b7f2af78633e9c25e0fc07600ab6 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
@@ -55,6 +55,6 @@ CLASS(OverkillMachineGun, Weapon)
 #undef X
 
 ENDCLASS(OverkillMachineGun)
-REGISTER_WEAPON(OVERKILL_MACHINEGUN, okmachinegun, NEW(OverkillMachineGun));
+REGISTER_WEAPON(OVERKILL_MACHINEGUN, NEW(OverkillMachineGun));
 
 //SPAWNFUNC_WEAPON(weapon_okmachinegun, WEP_OVERKILL_MACHINEGUN)

diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh
index 21bbfaa2f9f069d46554cd196b574b1eb884651a..1890f47fcbae00e657dcd8430b1f26f0951c665f 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/oknex.qh
+++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh
@@ -72,7 +72,7 @@ CLASS(OverkillNex, Weapon)
 #undef X
 
 ENDCLASS(OverkillNex)
-REGISTER_WEAPON(OVERKILL_NEX, oknex, NEW(OverkillNex));
+REGISTER_WEAPON(OVERKILL_NEX, NEW(OverkillNex));
 
 
 //SPAWNFUNC_WEAPON(weapon_oknex, WEP_OVERKILL_NEX)

diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qh b/qcsrc/common/mutators/mutator/overkill/okrpc.qh
index 28b76348840e84512f75083eb341a5e328ad3b0c..c63db10f7b18b5a24cdfd4caaa16d55c88be87d7 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okrpc.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qh
@@ -64,7 +64,7 @@ CLASS(OverkillRocketPropelledChainsaw, Weapon)
 #undef X
 
 ENDCLASS(OverkillRocketPropelledChainsaw)
-REGISTER_WEAPON(OVERKILL_RPC, okrpc, NEW(OverkillRocketPropelledChainsaw));
+REGISTER_WEAPON(OVERKILL_RPC, NEW(OverkillRocketPropelledChainsaw));
 
 //SPAWNFUNC_WEAPON(weapon_okrpc, WEP_OVERKILL_RPC)
 //SPAWNFUNC_WEAPON(weapon_rpc, WEP_OVERKILL_RPC)

diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
index e70fc43269f1eb329f2c9d6f9458ac29da5dd010..9bab936b557474676b44a820ad13896dfaa20813 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
@@ -54,6 +54,6 @@ CLASS(OverkillShotgun, Weapon)
 #undef X
 
 ENDCLASS(OverkillShotgun)
-REGISTER_WEAPON(OVERKILL_SHOTGUN, okshotgun, NEW(OverkillShotgun));
+REGISTER_WEAPON(OVERKILL_SHOTGUN, NEW(OverkillShotgun));
 
 //SPAWNFUNC_WEAPON(weapon_okshotgun, WEP_OVERKILL_SHOTGUN)

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 27a506935c3092cc797475b79c5f2a1caf86de3c..04d658734b1a4f2d53f20fd9fba7d5e3bc7f539a 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -122,13 +122,7 @@ STATIC_INIT_LATE(W_PROP_reloader)
 }
 #endif
 
-#define REGISTER_WEAPON(...) EVAL_REGISTER_WEAPON(OVERLOAD(REGISTER_WEAPON, __VA_ARGS__))
-#define EVAL_REGISTER_WEAPON(...) __VA_ARGS__
-#define REGISTER_WEAPON_2(id, inst) REGISTER(Weapons, WEP, id, m_id, inst)
-/** TODO: deprecated - remove */
-#define REGISTER_WEAPON_3(id, sname, inst) \
-    REGISTER_WEAPON_2(id, inst); \
-    [[alias("WEP_" #id)]] Weapon _wep_##sname
+#define REGISTER_WEAPON(id, inst) REGISTER(Weapons, WEP, id, m_id, inst)
 
 REGISTER_WEAPON(Null, NEW(Weapon));
 REGISTRY_DEFINE_GET(Weapons, WEP_Null)

diff --git a/qcsrc/common/weapons/weapon/arc.qh b/qcsrc/common/weapons/weapon/arc.qh
index 15a2cb772f15b8dde905e6cd6c5d65197d566576..a7d289c079c7cce6484b71e06db3a192801a4c26 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qh
+++ b/qcsrc/common/weapons/weapon/arc.qh
@@ -80,7 +80,7 @@ CLASS(Arc, Weapon)
 #undef X
 
 ENDCLASS(Arc)
-REGISTER_WEAPON(ARC, arc, NEW(Arc));
+REGISTER_WEAPON(ARC, NEW(Arc));
 
 SPAWNFUNC_WEAPON(weapon_arc, WEP_ARC)
 

diff --git a/qcsrc/common/weapons/weapon/blaster.qh b/qcsrc/common/weapons/weapon/blaster.qh
index 944e86405d595f3882532c0e887ef419e1b308c0..23e147478e43abb4e81cf4a3f7b6587123a1373e 100644 (file)
--- a/qcsrc/common/weapons/weapon/blaster.qh
+++ b/qcsrc/common/weapons/weapon/blaster.qh
@@ -46,7 +46,7 @@ CLASS(Blaster, Weapon)
 #undef X
 
 ENDCLASS(Blaster)
-REGISTER_WEAPON(BLASTER, blaster, NEW(Blaster));
+REGISTER_WEAPON(BLASTER, NEW(Blaster));
 
 SPAWNFUNC_WEAPON(weapon_blaster, WEP_BLASTER)
 SPAWNFUNC_WEAPON(weapon_laser, WEP_BLASTER)

diff --git a/qcsrc/common/weapons/weapon/crylink.qh b/qcsrc/common/weapons/weapon/crylink.qh
index 2329c364e2998f16d425856292da6c6431b181e3..872bbcb1aa723adf63226bf6bc43cd7370c7e0d7 100644 (file)
--- a/qcsrc/common/weapons/weapon/crylink.qh
+++ b/qcsrc/common/weapons/weapon/crylink.qh
@@ -60,7 +60,7 @@ CLASS(Crylink, Weapon)
 #undef X
 
 ENDCLASS(Crylink)
-REGISTER_WEAPON(CRYLINK, crylink, NEW(Crylink));
+REGISTER_WEAPON(CRYLINK, NEW(Crylink));
 
 SPAWNFUNC_WEAPON(weapon_crylink, WEP_CRYLINK)
 

diff --git a/qcsrc/common/weapons/weapon/devastator.qh b/qcsrc/common/weapons/weapon/devastator.qh
index 7a10bf62a17358ff085a8464d70fcdc24f1b7bfb..39fa3761348a6770c4a997db5d4bfe6570cd6fe3 100644 (file)
--- a/qcsrc/common/weapons/weapon/devastator.qh
+++ b/qcsrc/common/weapons/weapon/devastator.qh
@@ -65,7 +65,7 @@ CLASS(Devastator, Weapon)
 #undef X
 
 ENDCLASS(Devastator)
-REGISTER_WEAPON(DEVASTATOR, devastator, NEW(Devastator));
+REGISTER_WEAPON(DEVASTATOR, NEW(Devastator));
 
 SPAWNFUNC_WEAPON(weapon_devastator, WEP_DEVASTATOR)
 SPAWNFUNC_WEAPON(weapon_rocketlauncher, WEP_DEVASTATOR)

diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh
index e4263403bf82161b52cf66eac3a1507e9f4b3748..fe9199b8f9665fe0bb4c5b96e0491f57fa793b2e 100644 (file)
--- a/qcsrc/common/weapons/weapon/electro.qh
+++ b/qcsrc/common/weapons/weapon/electro.qh
@@ -73,7 +73,7 @@ CLASS(Electro, Weapon)
 #undef X
 
 ENDCLASS(Electro)
-REGISTER_WEAPON(ELECTRO, electro, NEW(Electro));
+REGISTER_WEAPON(ELECTRO, NEW(Electro));
 
 SPAWNFUNC_WEAPON(weapon_electro, WEP_ELECTRO)
 

diff --git a/qcsrc/common/weapons/weapon/fireball.qh b/qcsrc/common/weapons/weapon/fireball.qh
index c3dd73a2eb8bab5eea5d70b2288896533bdf9650..3ce41d9325a38fa9509dd400b6223c9a59e706dc 100644 (file)
--- a/qcsrc/common/weapons/weapon/fireball.qh
+++ b/qcsrc/common/weapons/weapon/fireball.qh
@@ -54,7 +54,7 @@ CLASS(Fireball, Weapon)
 #undef X
 
 ENDCLASS(Fireball)
-REGISTER_WEAPON(FIREBALL, fireball, NEW(Fireball));
+REGISTER_WEAPON(FIREBALL, NEW(Fireball));
 
 SPAWNFUNC_WEAPON(weapon_fireball, WEP_FIREBALL)
 

diff --git a/qcsrc/common/weapons/weapon/hagar.qh b/qcsrc/common/weapons/weapon/hagar.qh
index 5a43d84eff1fc5113e56058bc4a687d7fd95d54b..1d5ea28d647aea4fa5514dcbf90b8dfb233f1879 100644 (file)
--- a/qcsrc/common/weapons/weapon/hagar.qh
+++ b/qcsrc/common/weapons/weapon/hagar.qh
@@ -58,6 +58,6 @@ CLASS(Hagar, Weapon)
 #undef X
 
 ENDCLASS(Hagar)
-REGISTER_WEAPON(HAGAR, hagar, NEW(Hagar));
+REGISTER_WEAPON(HAGAR, NEW(Hagar));
 
 SPAWNFUNC_WEAPON(weapon_hagar, WEP_HAGAR)

diff --git a/qcsrc/common/weapons/weapon/hlac.qh b/qcsrc/common/weapons/weapon/hlac.qh
index ec07fa35a4ba76184f9afe38416e5a35cea28301..2d7e655d6c845c1051652465ae16961a3536f88f 100644 (file)
--- a/qcsrc/common/weapons/weapon/hlac.qh
+++ b/qcsrc/common/weapons/weapon/hlac.qh
@@ -50,6 +50,6 @@ CLASS(HLAC, Weapon)
 #undef X
 
 ENDCLASS(HLAC)
-REGISTER_WEAPON(HLAC, hlac, NEW(HLAC));
+REGISTER_WEAPON(HLAC, NEW(HLAC));
 
 SPAWNFUNC_WEAPON(weapon_hlac, WEP_HLAC)

diff --git a/qcsrc/common/weapons/weapon/hook.qh b/qcsrc/common/weapons/weapon/hook.qh
index 25b1be5073aa14542acc2e85802320597615c259..0bb7b84e1dfa997fd1add258ef5ca5d25d6c4a92 100644 (file)
--- a/qcsrc/common/weapons/weapon/hook.qh
+++ b/qcsrc/common/weapons/weapon/hook.qh
@@ -50,7 +50,7 @@ CLASS(Hook, Weapon)
 #undef X
 
 ENDCLASS(Hook)
-REGISTER_WEAPON(HOOK, hook, NEW(Hook));
+REGISTER_WEAPON(HOOK, NEW(Hook));
 
 SPAWNFUNC_WEAPON(weapon_hook, WEP_HOOK)
 

diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh
index a4097f947e252dfa01d49ba4c99459d7ca3cc962..eb7a438492bf50a43394ea9c81473b7e70a61175 100644 (file)
--- a/qcsrc/common/weapons/weapon/machinegun.qh
+++ b/qcsrc/common/weapons/weapon/machinegun.qh
@@ -57,7 +57,7 @@ CLASS(MachineGun, Weapon)
 #undef X
 
 ENDCLASS(MachineGun)
-REGISTER_WEAPON(MACHINEGUN, machinegun, NEW(MachineGun));
+REGISTER_WEAPON(MACHINEGUN, NEW(MachineGun));
 
 SPAWNFUNC_WEAPON(weapon_machinegun, WEP_MACHINEGUN)
 SPAWNFUNC_WEAPON(weapon_uzi, WEP_MACHINEGUN)

diff --git a/qcsrc/common/weapons/weapon/minelayer.qh b/qcsrc/common/weapons/weapon/minelayer.qh
index a574510f57736e373e0107ea59202d102ca09fca..1f503f7ff63eabb6483e6b554415f2b1fd75dda5 100644 (file)
--- a/qcsrc/common/weapons/weapon/minelayer.qh
+++ b/qcsrc/common/weapons/weapon/minelayer.qh
@@ -54,7 +54,7 @@ CLASS(MineLayer, Weapon)
     W_PROPS(X, MineLayer, minelayer)
 #undef X
 ENDCLASS(MineLayer)
-REGISTER_WEAPON(MINE_LAYER, minelayer, NEW(MineLayer));
+REGISTER_WEAPON(MINE_LAYER, NEW(MineLayer));
 
 SPAWNFUNC_WEAPON(weapon_minelayer, WEP_MINE_LAYER)
 

diff --git a/qcsrc/common/weapons/weapon/mortar.qh b/qcsrc/common/weapons/weapon/mortar.qh
index 6d44e75644ca0f2efe5865a2f855d46cec3f2c46..ce333250acc8f65023f01fe918481579db73c393 100644 (file)
--- a/qcsrc/common/weapons/weapon/mortar.qh
+++ b/qcsrc/common/weapons/weapon/mortar.qh
@@ -55,7 +55,7 @@ CLASS(Mortar, Weapon)
     W_PROPS(X, Mortar, mortar)
 #undef X
 ENDCLASS(Mortar)
-REGISTER_WEAPON(MORTAR, mortar, NEW(Mortar));
+REGISTER_WEAPON(MORTAR, NEW(Mortar));
 
 SPAWNFUNC_WEAPON(weapon_mortar, WEP_MORTAR)
 SPAWNFUNC_WEAPON(weapon_grenadelauncher, WEP_MORTAR)

diff --git a/qcsrc/common/weapons/weapon/porto.qh b/qcsrc/common/weapons/weapon/porto.qh
index 757386b5c3f9dd65db332d5ed948619f3cc74b12..30d76908b671c4cd693d22cbe45453112e5c02f0 100644 (file)
--- a/qcsrc/common/weapons/weapon/porto.qh
+++ b/qcsrc/common/weapons/weapon/porto.qh
@@ -34,7 +34,7 @@ CLASS(PortoLaunch, Weapon)
     W_PROPS(X, PortoLaunch, porto)
 #undef X
 ENDCLASS(PortoLaunch)
-REGISTER_WEAPON(PORTO, porto, NEW(PortoLaunch));
+REGISTER_WEAPON(PORTO, NEW(PortoLaunch));
 
 SPAWNFUNC_WEAPON(weapon_porto, WEP_PORTO)
 

diff --git a/qcsrc/common/weapons/weapon/rifle.qh b/qcsrc/common/weapons/weapon/rifle.qh
index e5a2cde2b0b3956f3081c0889e5aa98d11b56390..28151dc3d7e25f83167d00ef48218fe0aa2e8f8d 100644 (file)
--- a/qcsrc/common/weapons/weapon/rifle.qh
+++ b/qcsrc/common/weapons/weapon/rifle.qh
@@ -49,7 +49,7 @@ CLASS(Rifle, Weapon)
     W_PROPS(X, Rifle, rifle)
 #undef X
 ENDCLASS(Rifle)
-REGISTER_WEAPON(RIFLE, rifle, NEW(Rifle));
+REGISTER_WEAPON(RIFLE, NEW(Rifle));
 
 SPAWNFUNC_WEAPON(weapon_rifle, WEP_RIFLE)
 SPAWNFUNC_WEAPON(weapon_campingrifle, WEP_RIFLE)

diff --git a/qcsrc/common/weapons/weapon/seeker.qh b/qcsrc/common/weapons/weapon/seeker.qh
index d3024a436e485fa5a0bda7557d1489a4ebaca4a8..e62145ac41830305c5f55d17a61995ebfaa2bd58 100644 (file)
--- a/qcsrc/common/weapons/weapon/seeker.qh
+++ b/qcsrc/common/weapons/weapon/seeker.qh
@@ -83,7 +83,7 @@ CLASS(Seeker, Weapon)
        W_PROPS(X, Seeker, seeker)
 #undef X
 ENDCLASS(Seeker)
-REGISTER_WEAPON(SEEKER, seeker, NEW(Seeker));
+REGISTER_WEAPON(SEEKER, NEW(Seeker));
 
 SPAWNFUNC_WEAPON(weapon_seeker, WEP_SEEKER)
 

diff --git a/qcsrc/common/weapons/weapon/shockwave.qh b/qcsrc/common/weapons/weapon/shockwave.qh
index 9fa484b6a49ea75f22970ed610f7b711b34c2878..76d3c3ef258a567b880ef445e60ba25d2e76c3a9 100644 (file)
--- a/qcsrc/common/weapons/weapon/shockwave.qh
+++ b/qcsrc/common/weapons/weapon/shockwave.qh
@@ -73,7 +73,7 @@ CLASS(Shockwave, Weapon)
 #undef X
 
 ENDCLASS(Shockwave)
-REGISTER_WEAPON(SHOCKWAVE, shockwave, NEW(Shockwave));
+REGISTER_WEAPON(SHOCKWAVE, NEW(Shockwave));
 
 SPAWNFUNC_WEAPON(weapon_shockwave, WEP_SHOCKWAVE)
 

diff --git a/qcsrc/common/weapons/weapon/shotgun.qh b/qcsrc/common/weapons/weapon/shotgun.qh
index 5b200ed588e0df64bcfb951ab16e6e2ffcfb49e3..24c4ffa9b1ce6b0d36f6d48e0639843c1c32e172 100644 (file)
--- a/qcsrc/common/weapons/weapon/shotgun.qh
+++ b/qcsrc/common/weapons/weapon/shotgun.qh
@@ -54,5 +54,5 @@ CLASS(Shotgun, Weapon)
 #undef X
 
 ENDCLASS(Shotgun)
-REGISTER_WEAPON(SHOTGUN, shotgun, NEW(Shotgun));
+REGISTER_WEAPON(SHOTGUN, NEW(Shotgun));
 

diff --git a/qcsrc/common/weapons/weapon/tuba.qh b/qcsrc/common/weapons/weapon/tuba.qh
index 8855fc7527d50cc8bb4fa50965b25f1cfd45cdb4..f2a1712c55e9828ccee1ea7e91bb24431767e7f5 100644 (file)
--- a/qcsrc/common/weapons/weapon/tuba.qh
+++ b/qcsrc/common/weapons/weapon/tuba.qh
@@ -39,7 +39,7 @@ CLASS(Tuba, Weapon)
     W_PROPS(X, Tuba, tuba)
 #undef X
 ENDCLASS(Tuba)
-REGISTER_WEAPON(TUBA, tuba, NEW(Tuba));
+REGISTER_WEAPON(TUBA, NEW(Tuba));
 
 SPAWNFUNC_WEAPON(weapon_tuba, WEP_TUBA)
 

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qh b/qcsrc/common/weapons/weapon/vaporizer.qh
index 83a1660ccc6eb15fe091727b6bd991f3f45d6da2..8ceb969d45e6c8dadc97d05063bc77b44cc44e48 100644 (file)
--- a/qcsrc/common/weapons/weapon/vaporizer.qh
+++ b/qcsrc/common/weapons/weapon/vaporizer.qh
@@ -54,7 +54,7 @@ CLASS(Vaporizer, Weapon)
 #undef X
 
 ENDCLASS(Vaporizer)
-REGISTER_WEAPON(VAPORIZER, vaporizer, NEW(Vaporizer));
+REGISTER_WEAPON(VAPORIZER, NEW(Vaporizer));
 
 SPAWNFUNC_WEAPON(weapon_vaporizer, WEP_VAPORIZER)
 SPAWNFUNC_WEAPON(weapon_minstanex, WEP_VAPORIZER)

diff --git a/qcsrc/common/weapons/weapon/vortex.qh b/qcsrc/common/weapons/weapon/vortex.qh
index 2d80a7a61ae89b1266299984f8a783605d9426ab..e2f7c4f4feb9e2707ff6b2e3632c159211d65036 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qh
+++ b/qcsrc/common/weapons/weapon/vortex.qh
@@ -63,7 +63,7 @@ CLASS(Vortex, Weapon)
 #undef X
 
 ENDCLASS(Vortex)
-REGISTER_WEAPON(VORTEX, vortex, NEW(Vortex));
+REGISTER_WEAPON(VORTEX, NEW(Vortex));
 
 SPAWNFUNC_WEAPON(weapon_vortex, WEP_VORTEX)
 SPAWNFUNC_WEAPON(weapon_nex, WEP_VORTEX)