X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_models.qc;h=1026e3aa7a2dfaa6b0a139c3ad75eca12e141f94;hb=5e255d7a33f03f4b2d543c72c4401e13f6ecc9d5;hp=58fb26a4ed4a0acd1ed272252e3dbeac39bf7257;hpb=bc6fe08d1d10d513d52efb1ab57a27d6086b8397;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index 58fb26a4e..1026e3aa7 100644
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -1,6 +1,9 @@
 #include "g_models.qh"
 
+#include <server/defs.qh>
+#include <server/miscfunctions.qh>
 #include "g_subs.qh"
+#include <common/net_linked.qh>
 #include "../common/triggers/subs.qh"
 #include "../common/triggers/triggers.qh"
 
@@ -98,13 +101,12 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
 	{
 		if(sf & 0x40)
 			WriteShort(MSG_ENTITY, this.colormap);
+		WriteByte(MSG_ENTITY, this.skin);
 	}
 
 	if(sf & BIT(1))
 	{
-		WriteCoord(MSG_ENTITY, this.origin.x);
-		WriteCoord(MSG_ENTITY, this.origin.y);
-		WriteCoord(MSG_ENTITY, this.origin.z);
+		WriteVector(MSG_ENTITY, this.origin);
 	}
 
 	if(sf & BIT(2))
@@ -133,12 +135,8 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
 		WriteShort(MSG_ENTITY, floor(this.scale * 256));
 		if(sf & 0x20)
 		{
-			WriteCoord(MSG_ENTITY, this.mins.x);
-			WriteCoord(MSG_ENTITY, this.mins.y);
-			WriteCoord(MSG_ENTITY, this.mins.z);
-			WriteCoord(MSG_ENTITY, this.maxs.x);
-			WriteCoord(MSG_ENTITY, this.maxs.y);
-			WriteCoord(MSG_ENTITY, this.maxs.z);
+			WriteVector(MSG_ENTITY, this.mins);
+			WriteVector(MSG_ENTITY, this.maxs);
 		}
 		WriteString(MSG_ENTITY, this.bgmscript);
 		if(this.bgmscript != "")
@@ -147,9 +145,7 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
 			WriteByte(MSG_ENTITY, floor(this.bgmscriptdecay * 64));
 			WriteByte(MSG_ENTITY, floor(this.bgmscriptsustain * 255));
 			WriteByte(MSG_ENTITY, floor(this.bgmscriptrelease * 64));
-			WriteCoord(MSG_ENTITY, this.movedir.x);
-			WriteCoord(MSG_ENTITY, this.movedir.y);
-			WriteCoord(MSG_ENTITY, this.movedir.z);
+			WriteVector(MSG_ENTITY, this.movedir);
 			WriteByte(MSG_ENTITY, floor(this.lip * 255));
 		}
 		WriteByte(MSG_ENTITY, this.fade_start);