Merge branch 'z411/fix_resetmatch_scores' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / models.qc

diff --git a/qcsrc/common/mapobjects/models.qc b/qcsrc/common/mapobjects/models.qc
index 6b272d1b1671f2afc7515d2b48a6ca978a1237aa..85a8ab843620a151c774747bb3fd7001b0ff5386 100644 (file)
--- a/qcsrc/common/mapobjects/models.qc
+++ b/qcsrc/common/mapobjects/models.qc
@@ -1,15 +1,13 @@
 #include "models.qh"
 
 #ifdef SVQC
-#include <common/weapons/_all.qh>
-#include <common/stats.qh>
-#include <server/miscfunctions.qh>
-#include <common/net_linked.qh>
-#include "subs.qh"
-#include "triggers.qh"
-#include "bgmscript.qh"
-
 #include <common/constants.qh>
+#include <common/mapobjects/bgmscript.qh>
+#include <common/mapobjects/subs.qh>
+#include <common/mapobjects/triggers.qh>
+#include <common/net_linked.qh>
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
 #include <lib/csqcmodel/sv_model.qh>
 
 void g_model_setcolormaptoactivator(entity this, entity actor, entity trigger)
@@ -118,9 +116,9 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
                if(sf & 0x80)
                {
                        WriteShort(MSG_ENTITY, this.lodmodelindex0);
-                       WriteShort(MSG_ENTITY, bound(0, this.loddistance1, 65535));
+                       WriteShort(MSG_ENTITY, bound(0, this.loddistance1, 32767));
                        WriteShort(MSG_ENTITY, this.lodmodelindex1);
-                       WriteShort(MSG_ENTITY, bound(0, this.loddistance2, 65535));
+                       WriteShort(MSG_ENTITY, bound(0, this.loddistance2, 32767));
                        WriteShort(MSG_ENTITY, this.lodmodelindex2);
                }
                else
@@ -142,8 +140,8 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
                        WriteVector(MSG_ENTITY, this.movedir);
                        WriteByte(MSG_ENTITY, floor(this.lip * 255));
                }
-               WriteShort(MSG_ENTITY, bound(0, this.fade_start, 65535));
-               WriteShort(MSG_ENTITY, bound(0, this.fade_end, 65535));
+               WriteShort(MSG_ENTITY, bound(0, this.fade_start, 32767));
+               WriteShort(MSG_ENTITY, bound(0, this.fade_end, 32767));
                WriteByte(MSG_ENTITY, floor(this.alpha_max * 256));
                WriteByte(MSG_ENTITY, floor(this.alpha_min * 256));
                WriteByte(MSG_ENTITY, this.inactive);