Makefile: use `-I.`

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

diff --git a/qcsrc/lib/csqcmodel/common.qh b/qcsrc/lib/csqcmodel/common.qh
index 884977f9040758a49fecd718411d7cd09aad4168..a700f3af2b9bda88665508f3456a0bd066c6f613 100644 (file)
--- a/qcsrc/lib/csqcmodel/common.qh
+++ b/qcsrc/lib/csqcmodel/common.qh
@@ -22,7 +22,7 @@
 #ifndef LIB_CSQCMODEL_COMMON_H
 #define LIB_CSQCMODEL_COMMON_H
 
-#include "../../common/csqcmodel_settings.qh"
+#include <common/csqcmodel_settings.qh>
 
 noref string csqcmodel_license = "\
 Copyright (c) 2011 Rudolf Polzer\
@@ -44,7 +44,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS\
 IN THE SOFTWARE.\
-";
+"; // "
 
 .vector glowmod;
 .vector view_ofs;
@@ -54,15 +54,15 @@ IN THE SOFTWARE.\
 .float frame2time;
 .float lerpfrac;
 
-const int CSQCMODEL_PROPERTY_FRAME = 8388608;
-const int CSQCMODEL_PROPERTY_TELEPORTED = 4194304; // the "teleport bit" cancelling interpolation
-const int CSQCMODEL_PROPERTY_MODELINDEX = 2097152;
-const int CSQCMODEL_PROPERTY_ORIGIN = 1048576;
-const int CSQCMODEL_PROPERTY_YAW = 524288;
-const int CSQCMODEL_PROPERTY_PITCHROLL = 262144;
-const int CSQCMODEL_PROPERTY_FRAME2 = 131072;
-const int CSQCMODEL_PROPERTY_LERPFRAC = 65536;
-const int CSQCMODEL_PROPERTY_SIZE = 32768;
+const int CSQCMODEL_PROPERTY_FRAME = BIT(23);
+const int CSQCMODEL_PROPERTY_TELEPORTED = BIT(22); // the "teleport bit" cancelling interpolation
+const int CSQCMODEL_PROPERTY_MODELINDEX = BIT(21);
+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(16);
+const int CSQCMODEL_PROPERTY_SIZE = BIT(15);
 
 #define ALLPROPERTIES_COMMON \
        CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_FRAME, int, ReadByte, WriteByte, frame) \