Being macro-izing more things :D

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 7d3585725d2544ecd4dab000d907c51cbab6354e..d2b9d87ad3cdac6c16119de2178b367dc03ff06c 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -181,8 +181,9 @@ void setanim(entity e, vector anim, float looping, float override, float restart
 .float switchingweapon; // weapon currently being switched to (is copied from switchweapon once switch is possible)
 .string weaponname; // name of .weapon
 
+// WEAPONTODO
 .float autoswitch;
-float weapon_action(float wpn, float wrequest);
+//float weapon_action(float wpn, float wrequest);
 float client_hasweapon(entity cl, float wpn, float andammo, float complain);
 void w_clear();
 void w_ready();

diff --git a/qcsrc/server/weapons/cl_weapons.qc b/qcsrc/server/weapons/cl_weapons.qc
index 8870edf3ad8745d054873fcbb0463bfdd46641d9..35d5b0664a03e301a6aec4a388bd1c0909c0c780 100644 (file)
--- a/qcsrc/server/weapons/cl_weapons.qc
+++ b/qcsrc/server/weapons/cl_weapons.qc
@@ -153,10 +153,10 @@ float w_getbestweapon(entity e)
 
 // generic weapons table
 // TODO should they be macros instead?
-float weapon_action(float wpn, float wrequest)
-{
-       return (get_weaponinfo(wpn)).weapon_func(wrequest);
-}
+//float weapon_action(float wpn, float wrequest)
+//{
+//     return (get_weaponinfo(wpn)).weapon_func(wrequest);
+//}
 
 .float savenextthink;
 void thrown_wep_think()

diff --git a/qcsrc/server/weapons/cl_weapons.qh b/qcsrc/server/weapons/cl_weapons.qh
index bd60f4b01f14417740da86d4e262a343f5adb0a9..f860dafb52a4ea460eea2bef1528406a04079072 100644 (file)
--- a/qcsrc/server/weapons/cl_weapons.qh
+++ b/qcsrc/server/weapons/cl_weapons.qh
@@ -2,3 +2,6 @@ float weaponswapping;
 float internalteam;
 
 void weapon_defaultspawnfunc(float wpn);
+
+#define WEP_ACTION(wpn,wrequest) (get_weaponinfo(wpn)).weapon_func(wrequest)
+#define weapon_action(wpn,wrequest) (get_weaponinfo(wpn)).weapon_func(wrequest)