Merge branch 'master' into Mario/user_movetypes

[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 e922453afec8e6a0458462ffd886e36d61ff8865..37b88997ef84bf7d456e34575fc0859d79f01442 100644 (file)
--- a/qcsrc/lib/csqcmodel/common.qh
+++ b/qcsrc/lib/csqcmodel/common.qh
@@ -19,10 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#ifndef LIB_CSQCMODEL_COMMON_H
-#define LIB_CSQCMODEL_COMMON_H
+#pragma once
 
-#include "../../common/csqcmodel_settings.qh"
+#include <common/csqcmodel_settings.qh>
 
 noref string csqcmodel_license = "\
 Copyright (c) 2011 Rudolf Polzer\
@@ -44,7 +43,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;
@@ -61,7 +60,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 \
@@ -94,4 +93,3 @@ const int CSQCMODEL_PROPERTY_SIZE = BIT(15);
 #else
 #define ALLPROPERTIES ALLPROPERTIES_COMMON
 #endif
-#endif