From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 26 Oct 2015 23:34:09 +0000 (+1100)
Subject: Remove uses of nested BIT macro
X-Git-Tag: xonotic-v0.8.2~1785
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05bd68edc9b6d5dc11b248445a495da97d974e1b;p=xonotic%2Fxonotic-data.pk3dir.git

Remove uses of nested BIT macro
---

diff --git a/qcsrc/lib/csqcmodel/common.qh b/qcsrc/lib/csqcmodel/common.qh
index e922453af..6da742a04 100644
--- a/qcsrc/lib/csqcmodel/common.qh
+++ b/qcsrc/lib/csqcmodel/common.qh
@@ -61,7 +61,7 @@ const int CSQCMODEL_PROPERTY_ORIGIN = BIT(20);
 const int CSQCMODEL_PROPERTY_YAW = BIT(19);
 const int CSQCMODEL_PROPERTY_PITCHROLL = BIT(18);
 const int CSQCMODEL_PROPERTY_FRAME2 = BIT(17);
-const int CSQCMODEL_PROPERTY_LERPFRAC = BIT(BIT(4));
+const int CSQCMODEL_PROPERTY_LERPFRAC = BIT(16);
 const int CSQCMODEL_PROPERTY_SIZE = BIT(15);
 
 #define ALLPROPERTIES_COMMON \
diff --git a/qcsrc/server/constants.qh b/qcsrc/server/constants.qh
index 6de55189f..961b001d7 100644
--- a/qcsrc/server/constants.qh
+++ b/qcsrc/server/constants.qh
@@ -4,7 +4,7 @@
 const int FL_WEAPON = BIT(13);
 const int FL_POWERUP = BIT(14);
 const int FL_PROJECTILE = BIT(15);
-const int FL_TOSSED = BIT(BIT(4));
+const int FL_TOSSED = BIT(16);
 const int FL_NO_WEAPON_STAY = BIT(17);
 const int FL_SPAWNING = BIT(18);
 const int FL_PICKUPITEMS = BIT(19);