X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_models.qc;h=c8f85247c8aa775cd3c63d9d3d2c980800db807f;hb=41396c33b0c38cd231af7d1eeb037d3d1aa507b7;hp=348f307270d84b52c2ab9a6486318a948a81fdaa;hpb=c4230403a60e672acde0b6dfa32ca67f56879183;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index 348f30727..c8f85247c 100644
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -1,15 +1,18 @@
 #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"
 
 entityclass(BGMScript);
-class(BGMScript) .string bgmscript;
-class(BGMScript) .float bgmscriptattack;
-class(BGMScript) .float bgmscriptdecay;
-class(BGMScript) .float bgmscriptsustain;
-class(BGMScript) .float bgmscriptrelease;
+classfield(BGMScript) .string bgmscript;
+classfield(BGMScript) .float bgmscriptattack;
+classfield(BGMScript) .float bgmscriptdecay;
+classfield(BGMScript) .float bgmscriptsustain;
+classfield(BGMScript) .float bgmscriptrelease;
 
 #include "../common/constants.qh"
 #include "../lib/csqcmodel/sv_model.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,16 +145,14 @@ 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));
 		}
-		WriteShort(MSG_ENTITY, this.fade_start);
-		WriteShort(MSG_ENTITY, this.fade_end);
-		WriteShort(MSG_ENTITY, this.alpha_max);
-		WriteShort(MSG_ENTITY, this.alpha_min);
-		WriteShort(MSG_ENTITY, this.inactive);
+		WriteByte(MSG_ENTITY, this.fade_start);
+		WriteByte(MSG_ENTITY, this.fade_end);
+		WriteByte(MSG_ENTITY, this.alpha_max);
+		WriteByte(MSG_ENTITY, this.alpha_min);
+		WriteByte(MSG_ENTITY, this.inactive);
 		WriteShort(MSG_ENTITY, this.fade_vertical_offset);
 	}