From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 16 Nov 2011 10:17:41 +0000 (+0100)
Subject: make PMF_ more FTEQW-like
X-Git-Tag: xonotic-v0.6.0~74^2~100^2~50
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6a3541f392990590ce5d0bccc3e36c41fbfca58;p=xonotic%2Fxonotic-data.pk3dir.git

make PMF_ more FTEQW-like
---

diff --git a/qcsrc/csqcmodel/cl_player.qc b/qcsrc/csqcmodel/cl_player.qc
index f2e24d674..8679502ec 100644
--- a/qcsrc/csqcmodel/cl_player.qc
+++ b/qcsrc/csqcmodel/cl_player.qc
@@ -28,8 +28,9 @@ var float autocvar_chase_back;
 .float pmove_flags;
 float pmove_onground; // weird engine flag we shouldn't really use but have to for now
 #define PMF_DUCKED 4
-#define PMF_TELEPORTED 16
-#define PMF_ONGROUND 32
+#define PMF_ONGROUND 8
+#define REFDEFFLAG_TELEPORTED 1
+#define REFDEFFLAG_JUMPING 2
 
 entity csqcplayer;
 vector csqcplayer_origin, csqcplayer_velocity;
@@ -156,7 +157,8 @@ void CSQCPlayer_SetCamera()
 
 			CSQCPlayer_SetMinsMaxs();
 
-			self.view_ofs_z = getstati(STAT_VIEWHEIGHT);
+			// override it back just in case
+			self.view_ofs = '0 0 1' * getstati(STAT_VIEWHEIGHT);
 		}
 		else
 		{
@@ -193,16 +195,20 @@ void CSQCPlayer_SetCamera()
 		// relink
 		setorigin(self, self.origin);
 
+		// FIXME support svc_setview?
+
 		if(checkextension("DP_CSQC_V_CALCREFDEF"))
 		{
-			// set teleport bit
+			var float refdefflags = 0;
+
 			if(self.csqcmodel_teleported)
 			{
-				self.pmove_flags |= PMF_TELEPORTED;
+				refdefflags |= REFDEFFLAG_TELEPORTED;
 				self.csqcmodel_teleported = 0;
 			}
-			else
-				self.pmove_flags &~= PMF_TELEPORTED;
+
+			if(input_buttons & 4)
+				refdefflags |= REFDEFFLAG_JUMPING;
 
 			V_CalcRefdef(self);
 		}