X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics.qh;h=5ee8954d0c1bd9cbdeb8232f0aef5692672d7b7d;hb=b6a34dc838763a87c285482ecee9f130f687deaa;hp=d4e5fdd389b9e86dc33f8881c05403cbcff9f404;hpb=0a6d4cd16b83990beff55c8b7850a492da8864e2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh
index d4e5fdd389..5ee8954d0c 100644
--- a/qcsrc/common/physics.qh
+++ b/qcsrc/common/physics.qh
@@ -33,6 +33,7 @@ bool IsFlying(entity a);
 	void PM_multijump();
 
 	.float watertype;
+	.float waterlevel;
 	.int items;
 
 	.vector movement;
@@ -43,8 +44,8 @@ bool IsFlying(entity a);
 	#define IS_PLAYER(s)						(s).isplayermodel
 	#define isPushable(s)						(s).isplayermodel
 
-	float player_multijump;
-	float player_jumpheight;
+	//float player_multijump;
+	//float player_jumpheight;
 
 	#define PHYS_INPUT_ANGLES(s)   				input_angles
 // TODO
@@ -123,6 +124,7 @@ bool IsFlying(entity a);
 	#define PHYS_JUMPSPEEDCAP_MAX				cvar_string("cl_jumpspeedcap_max")
 	#define PHYS_JUMPSPEEDCAP_DISABLE_ONRAMPS	getstati(STAT_MOVEVARS_JUMPSPEEDCAP_DISABLE_ONRAMPS)
 
+	#define PHYS_CL_TRACK_CANJUMP(s)			getstati(STAT_MOVEVARS_CL_TRACK_CANJUMP)
 	#define PHYS_TRACK_CANJUMP(s)				getstati(STAT_MOVEVARS_TRACK_CANJUMP)
 	#define PHYS_ACCELERATE						getstatf(STAT_MOVEVARS_ACCELERATE)
 	#define PHYS_AIRACCEL_QW(s)					getstatf(STAT_MOVEVARS_AIRACCEL_QW)
@@ -247,6 +249,8 @@ bool IsFlying(entity a);
 	.float stat_nostep;
 	.float stat_jumpstep;
 
+	.bool stat_sv_track_canjump;
+
 	#define PHYS_INPUT_ANGLES(s)				s.v_angle
 	#define PHYS_WORLD_ANGLES(s)				s.angles
 
@@ -323,7 +327,8 @@ bool IsFlying(entity a);
 	#define PHYS_JUMPSPEEDCAP_MAX				autocvar_sv_jumpspeedcap_max
 	#define PHYS_JUMPSPEEDCAP_DISABLE_ONRAMPS	autocvar_sv_jumpspeedcap_max_disable_on_ramps
 
-	#define PHYS_TRACK_CANJUMP(s)				s.cvar_cl_movement_track_canjump
+	#define PHYS_CL_TRACK_CANJUMP(s)			s.cvar_cl_movement_track_canjump
+	#define PHYS_TRACK_CANJUMP(s)				s.stat_sv_track_canjump
 	#define PHYS_ACCELERATE						self.stat_sv_accelerate
 	#define PHYS_AIRACCEL_QW(s)					s.stat_sv_airaccel_qw
 	#define PHYS_AIRACCEL_QW_STRETCHFACTOR(s)	self.stat_sv_airaccel_qw_stretchfactor