X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics%2Fplayer.qh;h=eb044fb24f31aace84f193b04fdb8320d3d0611a;hb=3bd01e3ee79ab7ea2670bc781bf5d1d36cb9e79c;hp=da45243b63ae0b3f6b9738a71b418e40cbea92a4;hpb=d44927502027bfa3ccd6ccc98d9b7d6285c182c3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index da45243b6..eb044fb24 100644
--- a/qcsrc/common/physics/player.qh
+++ b/qcsrc/common/physics/player.qh
@@ -5,6 +5,50 @@
 #ifdef SVQC
 // TODO: get rid of this random dumb include!
 	#include <common/state.qh>
+
+float autocvar_sv_airaccel_qw;
+float autocvar_sv_airstrafeaccel_qw;
+float autocvar_sv_airspeedlimit_nonqw;
+float autocvar_sv_airaccel_qw_stretchfactor;
+float autocvar_sv_maxairstrafespeed;
+float autocvar_sv_airstrafeaccelerate;
+float autocvar_sv_warsowbunny_turnaccel;
+float autocvar_sv_airaccel_sideways_friction;
+float autocvar_sv_aircontrol;
+float autocvar_sv_aircontrol_power;
+float autocvar_sv_aircontrol_backwards;
+float autocvar_sv_aircontrol_sidewards;
+float autocvar_sv_aircontrol_penalty;
+float autocvar_sv_warsowbunny_airforwardaccel;
+float autocvar_sv_warsowbunny_topspeed;
+float autocvar_sv_warsowbunny_accel;
+float autocvar_sv_warsowbunny_backtosideratio;
+float autocvar_sv_friction;
+float autocvar_sv_accelerate;
+float autocvar_sv_stopspeed;
+float autocvar_sv_airaccelerate;
+float autocvar_sv_airstopaccelerate;
+float autocvar_sv_track_canjump;
+string autocvar_g_physics_clientselect_options;
+string autocvar_g_physics_clientselect_default;
+bool autocvar_g_jump_grunt;
+bool autocvar_g_physics_clientselect;
+float autocvar_g_maxspeed;
+float autocvar_g_movement_highspeed = 1;
+bool autocvar_g_movement_highspeed_q3_compat = 0;
+//float autocvar_g_nick_flood_penalty;
+int autocvar_g_nick_flood_penalty_red;
+int autocvar_g_nick_flood_penalty_yellow;
+//float autocvar_g_nick_flood_timeout;
+bool autocvar_speedmeter;
+string autocvar_sv_jumpspeedcap_max;
+float autocvar_sv_jumpspeedcap_max_disable_on_ramps;
+string autocvar_sv_jumpspeedcap_min;
+float autocvar_sv_jumpvelocity;
+float autocvar_sv_jumpvelocity_crouch;
+float autocvar_sv_maxairspeed;
+float autocvar_sv_maxspeed;
+bool autocvar_g_footsteps;
 #endif
 
 .entity conveyor;
@@ -135,17 +179,17 @@ STATIC_INIT(PHYS_INPUT_BUTTON)
 // used for special commands and idle checking, not from the engine
 // TODO: cache
 #define PHYS_INPUT_BUTTON_MASK(s) ( \
-	  ((1 <<  0) * PHYS_INPUT_BUTTON_ATCK(s)) \
-	| ((1 <<  1) * PHYS_INPUT_BUTTON_JUMP(s)) \
-	| ((1 <<  2) * PHYS_INPUT_BUTTON_ATCK2(s)) \
-	| ((1 <<  3) * PHYS_INPUT_BUTTON_ZOOM(s)) \
-	| ((1 <<  4) * PHYS_INPUT_BUTTON_CROUCH(s)) \
-	| ((1 <<  5) * PHYS_INPUT_BUTTON_HOOK(s)) \
-	| ((1 <<  6) * PHYS_INPUT_BUTTON_USE(s)) \
-	| ((1 <<  7) * PHYS_INPUT_BUTTON_BACKWARD(s)) \
-	| ((1 <<  8) * PHYS_INPUT_BUTTON_FORWARD(s)) \
-	| ((1 <<  9) * PHYS_INPUT_BUTTON_LEFT(s)) \
-	| ((1 << 10) * PHYS_INPUT_BUTTON_RIGHT(s)) \
+	  (BIT(0) * PHYS_INPUT_BUTTON_ATCK(s)) \
+	| (BIT(1) * PHYS_INPUT_BUTTON_JUMP(s)) \
+	| (BIT(2) * PHYS_INPUT_BUTTON_ATCK2(s)) \
+	| (BIT(3) * PHYS_INPUT_BUTTON_ZOOM(s)) \
+	| (BIT(4) * PHYS_INPUT_BUTTON_CROUCH(s)) \
+	| (BIT(5) * PHYS_INPUT_BUTTON_HOOK(s)) \
+	| (BIT(6) * PHYS_INPUT_BUTTON_USE(s)) \
+	| (BIT(7) * PHYS_INPUT_BUTTON_BACKWARD(s)) \
+	| (BIT(8) * PHYS_INPUT_BUTTON_FORWARD(s)) \
+	| (BIT(9) * PHYS_INPUT_BUTTON_LEFT(s)) \
+	| (BIT(10) * PHYS_INPUT_BUTTON_RIGHT(s)) \
 	)
 
 #define IS_JUMP_HELD(s)                     (!((s).flags & FL_JUMPRELEASED))
@@ -190,7 +234,7 @@ STATIC_INIT(PHYS_INPUT_BUTTON)
 	#define IS_CLIENT(s)                        (((s).isplayermodel & ISPLAYER_CLIENT) || (s) == csqcplayer)
 	#define IS_PLAYER(s)                        ((s).isplayermodel & ISPLAYER_PLAYER)
 	#define IS_NOT_A_CLIENT(s)                  (!(s).isplayermodel && (s) != csqcplayer)
-	#define isPushable(s)                       ((s).isplayermodel || (s).pushable || ((s).flags & FL_PROJECTILE))
+	#define IS_DEAD(s)                          (((s).classname == "ENT_CLIENT_MODEL") ? (s).csqcmodel_isdead : (GetResource((s), RES_HEALTH) <= 0))
 
 	//float player_multijump;
 	//float player_jumpheight;
@@ -283,7 +327,7 @@ STATIC_INIT(PHYS_INPUT_BUTTON)
 	#define PHYS_JUMPSPEEDCAP_MIN               autocvar_sv_jumpspeedcap_min
 	#define PHYS_JUMPSPEEDCAP_MAX               autocvar_sv_jumpspeedcap_max
 
-	#define PHYS_CL_TRACK_CANJUMP(s)            (CS(s).cvar_cl_movement_track_canjump)
+	#define PHYS_CL_TRACK_CANJUMP(s)            (CS_CVAR(s).cvar_cl_movement_track_canjump)
 
 #endif