]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
fixes some bit tests with superweapons
authorRudolf Polzer <divverent@alientrap.org>
Thu, 12 Jan 2012 13:13:39 +0000 (14:13 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 12 Jan 2012 13:13:39 +0000 (14:13 +0100)
qcsrc/server/t_items.qc

index 090788a6655661595118c73aa160823099ab0ca4..cce5bf8ea5c480460e5b1171705b29b74929f834 100644 (file)
@@ -939,7 +939,7 @@ void weapon_defaultspawnfunc(float wpn)
        if(!self.respawntime)
        {
                e = get_weaponinfo(wpn);
-               if(e.items == IT_SUPERWEAPON)
+               if(e.items & IT_SUPERWEAPON)
                {
                        self.respawntime = g_pickup_respawntime_superweapon;
                        self.respawntimejitter = g_pickup_respawntimejitter_superweapon;
@@ -1016,7 +1016,7 @@ void weapon_defaultspawnfunc(float wpn)
 
        e = get_weaponinfo(wpn);
 
-       if(e.items && e.items != IT_SUPERWEAPON)
+       if(e.items && !(e.items & IT_SUPERWEAPON))
        {
                for(i = 0, j = 1; i < 24; ++i, j *= 2)
                {