X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcsqcmodellib%2Fsv_model.qc;h=ef47a54da35370694038574a498a851092142d86;hb=a7bb2b78e1ec01f3d9c4adc57485fca615385568;hp=e6e4cfe43a091e3f2fd1a5efa615a8e2d6132e66;hpb=14d52331c099f8ad672f5ab28ada4dc50243230c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/csqcmodellib/sv_model.qc b/qcsrc/csqcmodellib/sv_model.qc
index e6e4cfe43..ef47a54da 100644
--- a/qcsrc/csqcmodellib/sv_model.qc
+++ b/qcsrc/csqcmodellib/sv_model.qc
@@ -25,7 +25,7 @@
 float CSQCModel_Send(entity to, float sf)
 {
 	// some nice flags for CSQCMODEL_IF
-	float isplayer = (self.flags & FL_CLIENT);
+	float isplayer = (IS_CLIENT(self));
 	float islocalplayer = (self == to);
 	float isnolocalplayer = (isplayer && (self != to));
 
@@ -34,7 +34,7 @@ float CSQCModel_Send(entity to, float sf)
 	unused_float = isnolocalplayer;
 
 	WriteByte(MSG_ENTITY, ENT_CLIENT_MODEL);
-	WriteShort(MSG_ENTITY, sf);
+	WriteInt24_t(MSG_ENTITY, sf);
 
 #define CSQCMODEL_IF(cond) if(cond) {
 #define CSQCMODEL_ENDIF }
@@ -59,7 +59,7 @@ float CSQCModel_Send(entity to, float sf)
 void CSQCModel_CheckUpdate()
 {
 	// some nice flags for CSQCMODEL_IF
-	float isplayer = (self.flags & FL_CLIENT);
+	float isplayer = (IS_CLIENT(self));
 	float islocalplayer = isplayer; // we set BOTH to 1 here as we need the sendflags
 	float isnolocalplayer = isplayer; // we set BOTH to 1 here as we need the sendflags
 
@@ -78,13 +78,13 @@ void CSQCModel_CheckUpdate()
 	if(self.effects & EF_RESTARTANIM_BIT)
 	{
 		self.SendFlags |= CSQCMODEL_PROPERTY_FRAME | CSQCMODEL_PROPERTY_FRAME2; // full anim resend please
-		self.effects &~= EF_RESTARTANIM_BIT;
+		self.effects &= ~EF_RESTARTANIM_BIT;
 	}
 
 	if(self.effects & EF_TELEPORT_BIT)
 	{
 		self.SendFlags |= CSQCMODEL_PROPERTY_TELEPORTED; // no interpolation please
-		self.effects &~= EF_TELEPORT_BIT;
+		self.effects &= ~EF_TELEPORT_BIT;
 	}
 
 #define CSQCMODEL_IF(cond) if(cond) {
@@ -100,7 +100,7 @@ void CSQCModel_CheckUpdate()
 	}
 #define CSQCMODEL_PROPERTY_SCALED(flag,t,r,w,f,s,mi,ma) \
 	{ \
-		t tmp = bound(mi, s * self.f, ma) - mi; \
+		t tmp = rint(bound(mi, s * self.f, ma) - mi); \
 		if(tmp != self.csqcmodel_##f) \
 		{ \
 			self.csqcmodel_##f = tmp; \