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

diff --git a/qcsrc/csqcmodellib/sv_model.qc b/qcsrc/csqcmodellib/sv_model.qc
index bf6eefa697..1baad7b98d 100644
--- a/qcsrc/csqcmodellib/sv_model.qc
+++ b/qcsrc/csqcmodellib/sv_model.qc
@@ -25,10 +25,14 @@
 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);
 
@@ -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) {