From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 4 Mar 2012 19:11:19 +0000 (+0100)
Subject: register weapon: remove useless arg
X-Git-Tag: xonotic-v0.7.0~348^2~1^2~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=43a4ed866c90a0ad136d149378415bf7d44be270;p=xonotic%2Fxonotic-data.pk3dir.git

register weapon: remove useless arg
---

diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh
index 48ef741a2..c022d2672 100644
--- a/qcsrc/common/items.qh
+++ b/qcsrc/common/items.qh
@@ -162,7 +162,7 @@ float WEP_LAST;
 WEPSET_DECLARE_A(WEPBIT_ALL);
 WEPSET_DECLARE_A(WEPBIT_SUPERWEAPONS);
 // note: the fabs call is just there to hide "if result is constant" warning
-#define REGISTER_WEAPON_2(id,bit,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname) \
+#define REGISTER_WEAPON_2(id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname) \
 	float id; \
 	float func(float); \
 	void RegisterWeapons_##id() \
@@ -177,10 +177,10 @@ WEPSET_DECLARE_A(WEPBIT_SUPERWEAPONS);
 	ACCUMULATE_FUNCTION(RegisterWeapons, RegisterWeapons_##id)
 #ifdef MENUQC
 #define REGISTER_WEAPON(id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname) \
-	REGISTER_WEAPON_2(WEP_##id,WEPBIT_##id,w_null,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname)
+	REGISTER_WEAPON_2(WEP_##id,w_null,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname)
 #else
 #define REGISTER_WEAPON(id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname) \
-	REGISTER_WEAPON_2(WEP_##id,WEPBIT_##id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname)
+	REGISTER_WEAPON_2(WEP_##id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname)
 #endif
 
 #include "../server/w_all.qc"