X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics.qh;h=5ee8954d0c1bd9cbdeb8232f0aef5692672d7b7d;hb=462c2c8effb89afbf12619719222d896ff261dae;hp=17de7b22733aa414700b9b0fa7f09b4b14f1b4af;hpb=98e1375c9938f3d86d6f8e28f44cd6af74d2fc0e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh
index 17de7b227..5ee8954d0 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
@@ -95,7 +96,7 @@ bool IsFlying(entity a);
 	#define WAS_ONGROUND(s)						!!(s.lastflags & FL_ONGROUND)
 
 	#define ITEMS_STAT(s) 						(s).items
-	#define BUFFS(s)							getstati(STAT_BUFFS)
+	#define BUFFS_STAT(s)						getstati(STAT_BUFFS)
 
 	#define PHYS_AMMO_FUEL(s)					getstati(STAT_FUEL)
 
@@ -119,10 +120,11 @@ bool IsFlying(entity a);
 	#define PHYS_BUGRIGS_REVERSE_SPINNING 		getstatf(STAT_BUGRIGS_REVERSE_SPINNING)
 	#define PHYS_BUGRIGS_REVERSE_STOPPING 		getstatf(STAT_BUGRIGS_REVERSE_STOPPING)
 
-	#define PHYS_JUMPSPEEDCAP_MIN				getstatf(STAT_MOVEVARS_JUMPSPEEDCAP_MIN)
-	#define PHYS_JUMPSPEEDCAP_MAX				getstatf(STAT_MOVEVARS_JUMPSPEEDCAP_MAX)
+	#define PHYS_JUMPSPEEDCAP_MIN				cvar_string("cl_jumpspeedcap_min")
+	#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)
@@ -191,8 +193,8 @@ bool IsFlying(entity a);
 
 	.float stat_doublejump;
 
-	.float stat_jumpspeedcap_min;
-	.float stat_jumpspeedcap_max;
+	.string stat_jumpspeedcap_min;
+	.string stat_jumpspeedcap_max;
 	.float stat_jumpspeedcap_disable_onramps;
 
 	.float stat_jetpack_accel_side;
@@ -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
 
@@ -295,7 +299,7 @@ bool IsFlying(entity a);
 	#define WAS_ONGROUND(s)						!!((s).lastflags & FL_ONGROUND)
 
 	#define ITEMS_STAT(s)						s.items
-	#define BUFFS(s)							(s).buffs
+	#define BUFFS_STAT(s)						(s).buffs
 
 	#define PHYS_AMMO_FUEL(s)					s.ammo_fuel
 
@@ -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