X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_models.qc;h=539522f2dce7f61ca49d840f6040439450916e8c;hp=38e72c7329977c77e6d022c33908f5cc1742c5fd;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hpb=edf01df130d0d1877461561178b8833a9ab6051c

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index 38e72c7329..539522f2dc 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,6 +101,7 @@ 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))
@@ -152,11 +156,11 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
 			WriteCoord(MSG_ENTITY, this.movedir.z);
 			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);
 	}
 
@@ -165,7 +169,7 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
 
 
 #define G_MODEL_INIT(ent,sol) \
-	if(ent.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) ent.movetype = MOVETYPE_PHYSICS; \
+	if(ent.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) set_movetype(ent, MOVETYPE_PHYSICS); \
 	if(!ent.scale) ent.scale = ent.modelscale; \
 	SetBrushEntityModel(ent); \
 	ent.use = g_model_setcolormaptoactivator; \
@@ -173,7 +177,7 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
 	if(!ent.solid) ent.solid = (sol); else if(ent.solid < 0) ent.solid = SOLID_NOT;
 
 #define G_CLIENTMODEL_INIT(ent,sol) \
-	if(ent.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) ent.movetype = MOVETYPE_PHYSICS; \
+	if(ent.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) set_movetype(ent, MOVETYPE_PHYSICS); \
 	if(!ent.scale) ent.scale = ent.modelscale; \
 	SetBrushEntityModel(ent); \
 	ent.use = g_clientmodel_use; \