r5179 - trunk/data/qcsrc/common

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-12-09 01:17:04 -0500 (Tue, 09 Dec 2008)
New Revision: 5179

Modified:
   trunk/data/qcsrc/common/items.qc
Log:
fteqcc now supports more than 8 macro args - use them


Modified: trunk/data/qcsrc/common/items.qc
===================================================================
--- trunk/data/qcsrc/common/items.qc	2008-12-08 13:08:05 UTC (rev 5178)
+++ trunk/data/qcsrc/common/items.qc	2008-12-09 06:17:04 UTC (rev 5179)
@@ -84,33 +84,15 @@
 	return fixPriorityList(order, WEP_FIRST, WEP_LAST, complete);
 }
 
-// FTEQCC SUCKS // #ifdef SVQC
-// FTEQCC SUCKS // #define register_weapon(id,func,ammotype,i,normalweapon,canclimb,pickupbasevalue,modelname,shortname,wname) \
-// FTEQCC SUCKS // 	register_weapon_real(id,func,ammotype,i,normalweapon,canclimb,pickupbasevalue,modelname,shortname,wname)
-// FTEQCC SUCKS // #else
-// FTEQCC SUCKS // // no weapon funcs here!
-// FTEQCC SUCKS // #define register_weapon(id,func,ammotype,i,normalweapon,canclimb,pickupbasevalue,modelname,shortname,wname) \
-// FTEQCC SUCKS // 	register_weapon_real(id,w_null,ammotype,i,normalweapon,canclimb,pickupbasevalue,modelname,shortname,wname)
-// FTEQCC SUCKS // #endif
-// put this code back in if fteqcc gets fixed
+#ifdef SVQC
+#define register_weapon(id,func,ammotype,i,normalweapon,canclimb,pickupbasevalue,modelname,shortname,wname) \
+	register_weapon_real(id,func,ammotype,i,normalweapon,canclimb,pickupbasevalue,modelname,shortname,wname)
+#else
+// no weapon funcs here!
+#define register_weapon(id,func,ammotype,i,normalweapon,canclimb,pickupbasevalue,modelname,shortname,wname) \
+	register_weapon_real(id,w_null,ammotype,i,normalweapon,canclimb,pickupbasevalue,modelname,shortname,wname)
+#endif
 
-#define register_weapon register_weapon_real
-float(float) w_laser;
-float(float) w_shotgun;
-float(float) w_uzi;
-float(float) w_glauncher;
-float(float) w_electro;
-float(float) w_crylink;
-float(float) w_nex;
-float(float) w_hagar;
-float(float) w_rlauncher;
-float(float) w_porto;
-float(float) w_minstanex;
-float(float) w_hook;
-float(float) w_seeker;
-float(float) w_hlac;
-// I know this causes lots of warnings, but well, alternative code is above - use that code if fteqcc got fixed
-
 void RegisterWeapons()
 {
 	// %weaponaddpoint