X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_models.qc;h=c8f85247c8aa775cd3c63d9d3d2c980800db807f;hb=4afba1cb5f5e1526d4f8c26dae616b6bc32e9461;hp=d3f56f5f04424f55b9eb77c3a40fc92422ea7175;hpb=f3a09b33a838077c30c565cf68739ab49790a30e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index d3f56f5f0..c8f85247c 100644
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -1,16 +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"
@@ -104,9 +106,7 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
 
 	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))
@@ -135,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 != "")
@@ -149,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);