X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcsqcmodellib%2Fcl_player.qc;h=4f7381a4af83fa73047368e1b9bccd5492e1cc09;hb=71e6c75bc408ae5a116f296797c49c0cef7be113;hp=f77f9512623e099cea3f7f4fecff98e762e5019c;hpb=48388e38c1377c33f08feed8e76c0a2c9212a20c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/csqcmodellib/cl_player.qc b/qcsrc/csqcmodellib/cl_player.qc
index f77f95126..4f7381a4a 100644
--- a/qcsrc/csqcmodellib/cl_player.qc
+++ b/qcsrc/csqcmodellib/cl_player.qc
@@ -60,13 +60,13 @@ void CSQCPlayer_SetPredictionError(vector o, vector v, float onground_diff)
 	// commented out as this one did not help
 	if(onground_diff)
 	{
-		print(sprintf("ONGROUND MISMATCH: %d x=%v v=%v\n", onground_diff, o, v));
+		printf("ONGROUND MISMATCH: %d x=%v v=%v\n", onground_diff, o, v);
 		return;
 	}
 	*/
 	if(vlen(o) > 32 || vlen(v) > 192)
 	{
-		//print(sprintf("TOO BIG: x=%v v=%v\n", o, v));
+		//printf("TOO BIG: x=%v v=%v\n", o, v);
 		return;
 	}
 
@@ -193,7 +193,7 @@ void CSQCPlayer_SetCamera()
 
 			// get crouch state from the server
 			if(getstati(STAT_VIEWHEIGHT) == PL_VIEW_OFS_z)
-				self.pmove_flags &~= PMF_DUCKED;
+				self.pmove_flags &= ~PMF_DUCKED;
 			else if(getstati(STAT_VIEWHEIGHT) == PL_CROUCH_VIEW_OFS_z)
 				self.pmove_flags |= PMF_DUCKED;
 
@@ -201,7 +201,7 @@ void CSQCPlayer_SetCamera()
 			if(pmove_onground)
 				self.pmove_flags |= PMF_ONGROUND;
 			else
-				self.pmove_flags &~= PMF_ONGROUND;
+				self.pmove_flags &= ~PMF_ONGROUND;
 
 			CSQCPlayer_SetMinsMaxs();
 
@@ -213,6 +213,11 @@ void CSQCPlayer_SetCamera()
 		}
 		else
 		{
+			float flg = self.iflags;
+			self.iflags &= ~(IFLAG_ORIGIN | IFLAG_ANGLES);
+			InterpolateOrigin_Do();
+			self.iflags = flg;
+
 			if(csqcplayer_status == CSQCPLAYERSTATUS_FROMSERVER)
 			{
 				vector o, v;
@@ -226,7 +231,7 @@ void CSQCPlayer_SetCamera()
 
 				// get crouch state from the server
 				if(getstati(STAT_VIEWHEIGHT) == PL_VIEW_OFS_z)
-					self.pmove_flags &~= PMF_DUCKED;
+					self.pmove_flags &= ~PMF_DUCKED;
 				else if(getstati(STAT_VIEWHEIGHT) == PL_CROUCH_VIEW_OFS_z)
 					self.pmove_flags |= PMF_DUCKED;
 
@@ -234,7 +239,7 @@ void CSQCPlayer_SetCamera()
 				if(pmove_onground)
 					self.pmove_flags |= PMF_ONGROUND;
 				else
-					self.pmove_flags &~= PMF_ONGROUND;
+					self.pmove_flags &= ~PMF_ONGROUND;
 
 				CSQCPlayer_SavePrediction();
 			}
@@ -243,7 +248,7 @@ void CSQCPlayer_SetCamera()
 #ifdef CSQCMODEL_SERVERSIDE_CROUCH
 			// get crouch state from the server (LAG)
 			if(getstati(STAT_VIEWHEIGHT) == PL_VIEW_OFS_z)
-				self.pmove_flags &~= PMF_DUCKED;
+				self.pmove_flags &= ~PMF_DUCKED;
 			else if(getstati(STAT_VIEWHEIGHT) == PL_CROUCH_VIEW_OFS_z)
 				self.pmove_flags |= PMF_DUCKED;
 #endif