X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcsqcmodellib%2Fsv_model.qc;h=cbc26213cea2e54dd265ab931de3f7b635090461;hb=845401fd312c66c059aaee1772ac5d79555ab4fc;hp=bf6eefa6971b0b0c3f9687c61e60608e9e13ff3d;hpb=1c2bdc1f0012349f80906e05902ce19bed35be16;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/csqcmodellib/sv_model.qc b/qcsrc/csqcmodellib/sv_model.qc
index bf6eefa69..cbc26213c 100644
--- a/qcsrc/csqcmodellib/sv_model.qc
+++ b/qcsrc/csqcmodellib/sv_model.qc
@@ -25,12 +25,16 @@
 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));
 
+	unused_float = isplayer;
+	unused_float = islocalplayer;
+	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 }
@@ -46,7 +50,7 @@ float CSQCModel_Send(entity to, float sf)
 #undef CSQCMODEL_ENDIF
 #undef CSQCMODEL_IF
 
-	return TRUE;
+	return true;
 }
 
 #ifdef CSQCPLAYER_FORCE_UPDATES
@@ -55,10 +59,14 @@ 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
 
+	unused_float = isplayer;
+	unused_float = islocalplayer;
+	unused_float = isnolocalplayer;
+
 #ifdef CSQCPLAYER_FORCE_UPDATES
 	if(isplayer && time > self.csqcmodel_nextforcedupdate)
 	{
@@ -70,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) {
@@ -92,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; \