less evil in t_items.qc now

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items.qh

diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh
index bd97d4399292ce8bd8a3d8f7ccafe151df3edcd3..89d2419ffbd3d71d2e5fcf715399c4a7780b0c31 100644 (file)
--- a/qcsrc/common/items.qh
+++ b/qcsrc/common/items.qh
@@ -90,57 +90,82 @@ void register_weapon(float id, float(float) func, float ammotype, float i, float
 void register_weapons_done();
 
 #if 1
-# define WEPBITS_CLEAR_E(e) ((e).weapons = 0)
-# define WEPBITS_CLEAR_A(a) ((a) = 0)
-
-# define WEPBITS_COPY_EE(e,e2) ((e).weapons = (e2).weapons)
-# define WEPBITS_OR_EE(e,e2) ((e).weapons |= (e2).weapons)
-# define WEPBITS_AND_EE(e,e2) ((e).weapons &= (e2).weapons)
-# define WEPBITS_ANDNOT_EE(e,e2) ((e).weapons &~= (e2).weapons)
-# define WEPBITS_TEST_EE(e,e2) ((e).weapons & (e2).weapons)
-
-# define WEPBITS_COPY_EA(e,a) ((e).weapons = (a))
-# define WEPBITS_OR_EA(e,a) ((e).weapons |= (a))
-# define WEPBITS_AND_EA(e,a) ((e).weapons &= (a))
-# define WEPBITS_ANDNOT_EA(e,a) ((e).weapons &~= (a))
-# define WEPBITS_TEST_EA(e,a) ((e).weapons & (a))
-
-# define WEPBITS_COPY_AA(a,a2) ((a) = (a2))
-# define WEPBITS_OR_AA(a,a2) ((a) |= (a2))
-# define WEPBITS_AND_AA(a,a2) ((a) &= (a2))
-# define WEPBITS_ANDNOT_AA(a,a2) ((a) &~= (a2))
-# define WEPBITS_TEST_AA(a,a2) ((a) & (a2))
-
-# define WEPBITS_COPY_EW(e,w) ((e).weapons = power2of((w) - WEP_FIRST))
-# define WEPBITS_OR_EW(e,w) ((e).weapons |= power2of((w) - WEP_FIRST))
-# define WEPBITS_AND_EW(e,w) ((e).weapons &= power2of((w) - WEP_FIRST))
-# define WEPBITS_ANDNOT_EW(e,w) ((e).weapons &~= power2of((w) - WEP_FIRST))
-# define WEPBITS_TEST_EW(e,w) ((e).weapons & power2of((w) - WEP_FIRST))
-
-# define WEPBITS_COPY_AW(a,w) ((a) = power2of((w) - WEP_FIRST))
-# define WEPBITS_OR_AW(a,w) ((a) |= power2of((w) - WEP_FIRST))
-# define WEPBITS_AND_AW(a,w) ((a) &= power2of((w) - WEP_FIRST))
-# define WEPBITS_ANDNOT_AW(a,w) ((a) &~= power2of((w) - WEP_FIRST))
-# define WEPBITS_TEST_AW(a,w) ((a) & power2of((w) - WEP_FIRST))
+.float weapons;
+# define WEPSET_DECLARE_A(a) float _WS_##a
+
+# define WEPSET_CLEAR_E(e) ((e).weapons = 0)
+# define WEPSET_CLEAR_A(a) ((_WS_##a) = 0)
+
+# define WEPSET_EMPTY_E(e) ((e).weapons == 0)
+# define WEPSET_EMPTY_A(a) ((_WS_##a) == 0)
+
+# define WEPSET_COPY_EE(e,o) ((e).weapons = (o).weapons)
+# define WEPSET_EQ_EE(e,o) ((e).weapons == (o).weapons)
+# define WEPSET_OR_EE(e,o) ((e).weapons |= (o).weapons)
+# define WEPSET_AND_EE(e,o) ((e).weapons &= (o).weapons)
+# define WEPSET_ANDNOT_EE(e,o) ((e).weapons &~= (o).weapons)
+# define WEPSET_CONTAINS_ANY_EE(e,o) !!((e).weapons & (o).weapons)
+# define WEPSET_CONTAINS_ALL_EE(e,o) !!(((e).weapons & (o).weapons) == (e).weapons)
+
+# define WEPSET_COPY_EA(e,a) ((e).weapons = (_WS_##a))
+# define WEPSET_EQ_EA(e,a) ((e).weapons == (_WS_##a))
+# define WEPSET_OR_EA(e,a) ((e).weapons |= (_WS_##a))
+# define WEPSET_AND_EA(e,a) ((e).weapons &= (_WS_##a))
+# define WEPSET_ANDNOT_EA(e,a) ((e).weapons &~= (_WS_##a))
+# define WEPSET_CONTAINS_ANY_EA(e,a) !!((e).weapons & (_WS_##a))
+# define WEPSET_CONTAINS_ALL_EA(e,a) !!(((e).weapons & (_WS_##a)) == (_WS_##a))
+
+# define WEPSET_COPY_EW(e,w) ((e).weapons = power2of((w) - WEP_FIRST))
+# define WEPSET_EQ_EW(e,w) ((e).weapons == power2of((w) - WEP_FIRST))
+# define WEPSET_OR_EW(e,w) ((e).weapons |= power2of((w) - WEP_FIRST))
+# define WEPSET_AND_EW(e,w) ((e).weapons &= power2of((w) - WEP_FIRST))
+# define WEPSET_ANDNOT_EW(e,w) ((e).weapons &~= power2of((w) - WEP_FIRST))
+# define WEPSET_CONTAINS_EW(e,w) !!((e).weapons & power2of((w) - WEP_FIRST))
+
+# define WEPSET_COPY_AE(a,e) ((_WS_##a) = (e).weapons)
+# define WEPSET_EQ_AE(a,e) ((_WS_##a) == (e).weapons)
+# define WEPSET_OR_AE(a,e) ((_WS_##a) |= (e).weapons)
+# define WEPSET_AND_AE(a,e) ((_WS_##a) &= (e).weapons)
+# define WEPSET_ANDNOT_AE(a,e) ((_WS_##a) &~= (e).weapons)
+# define WEPSET_CONTAINS_ANY_AE(a,e) !!((_WS_##a) & (e).weapons)
+# define WEPSET_CONTAINS_ALL_AE(a,e) !!(((_WS_##a) & (e).weapons) == (e))
+
+# define WEPSET_COPY_AA(a,b) ((_WS_##a) = (_WS_##b))
+# define WEPSET_EQ_AA(a,b) ((_WS_##a) == (_WS_##b))
+# define WEPSET_OR_AA(a,b) ((_WS_##a) |= (_WS_##b))
+# define WEPSET_AND_AA(a,b) ((_WS_##a) &= (_WS_##b))
+# define WEPSET_ANDNOT_AA(a,b) ((_WS_##a) &~= (_WS_##b))
+# define WEPSET_CONTAINS_ANY_AA(a,b) !!((_WS_##a) & (_WS_##b))
+# define WEPSET_CONTAINS_ALL_AA(a,b) !!(((_WS_##a) & (_WS_##b)) == (_WS_##b))
+
+# define WEPSET_COPY_AW(a,w) ((_WS_##a) = power2of((w) - WEP_FIRST))
+# define WEPSET_EQ_AW(a,w) ((_WS_##a) == power2of((w) - WEP_FIRST))
+# define WEPSET_OR_AW(a,w) ((_WS_##a) |= power2of((w) - WEP_FIRST))
+# define WEPSET_AND_AW(a,w) ((_WS_##a) &= power2of((w) - WEP_FIRST))
+# define WEPSET_ANDNOT_AW(a,w) ((_WS_##a) &~= power2of((w) - WEP_FIRST))
+# define WEPSET_CONTAINS_AW(a,w) !((_WS_##a) & power2of((w) - WEP_FIRST))
+
+# ifdef CSQC
+#  define WEPSET_COPY_AS(a) ((_WS_##a) = getstatf(STAT_WEAPONS))
+# endif
 #endif
 
 float WEP_COUNT;
 float WEP_FIRST = 1;
 float WEP_LAST;
 #define WEP_MAXCOUNT 24
-float WEPBIT_ALL;
-float WEPBIT_SUPERWEAPONS;
+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) \
        float id; \
-       float bit; \
        float func(float); \
        void RegisterWeapons_##id() \
        { \
                WEP_LAST = (id = WEP_FIRST + WEP_COUNT); \
-               WEPBITS_OR_AW(WEPBIT_ALL, id); \
+               WEPSET_OR_AW(WEPBIT_ALL, id); \
                if(fabs(weapontype & WEP_FLAG_SUPERWEAPON)) \
-                       WEPBITS_OR_AW(WEPBIT_SUPERWEAPONS, id); \
+                       WEPSET_OR_AW(WEPBIT_SUPERWEAPONS, id); \
                ++WEP_COUNT; \
                register_weapon(id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname); \
        } \