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 6504e1724e095f6a97ef7ec6a2f674b304c99f99..89d2419ffbd3d71d2e5fcf715399c4a7780b0c31 100644 (file)
--- a/qcsrc/common/items.qh
+++ b/qcsrc/common/items.qh
@@ -104,46 +104,46 @@ void register_weapons_done();
 # 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_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_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_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_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_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))
+# define WEPSET_CONTAINS_AW(a,w) !((_WS_##a) & power2of((w) - WEP_FIRST))
 
 # ifdef CSQC
 #  define WEPSET_COPY_AS(a) ((_WS_##a) = getstatf(STAT_WEAPONS))
@@ -159,7 +159,6 @@ 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() \
        { \