From: Samual Lenks <samual@xonotic.org>
Date: Fri, 28 Jun 2013 22:22:28 +0000 (-0400)
Subject: Being macro-izing more things :D
X-Git-Tag: xonotic-v0.8.0~152^2~376
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f9087367c01306b80ff48dc9b656e49b834fa185;p=xonotic%2Fxonotic-data.pk3dir.git

Being macro-izing more things :D
---

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 7d3585725..d2b9d87ad 100644
--- 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 8870edf3a..35d5b0664 100644
--- 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 bd60f4b01..f860dafb5 100644
--- 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)