X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics.qh;h=9612f0cfb9d33663bb97c984a7ae061a79545c0f;hp=a169ad4ff67de1ce2fb0b3ea6933dcf5a165c3b7;hb=244e5081c5c503c307e557c98ac864f6c9731475;hpb=ce4e626fe2d78ad7779e4e9ccc9cc46f850493ea

diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh
index a169ad4ff6..9612f0cfb9 100644
--- a/qcsrc/common/physics.qh
+++ b/qcsrc/common/physics.qh
@@ -1,9 +1,39 @@
+#ifndef COMMON_PHYSICS_H
+#define COMMON_PHYSICS_H
+
 // Client/server mappings
 
 .entity conveyor;
 
+.float race_penalty;
+
+.float gravity;
+.float swamp_slowdown;
+.float lastflags;
+.float lastground;
+.float wasFlying;
+.float spectatorspeed;
+
+.vector movement_old;
+.float buttons_old;
+.vector v_angle_old;
+.string lastclassname;
+
+.float() PlayerPhysplug;
+float AdjustAirAccelQW(float accelqw, float factor);
+
 #ifdef CSQC
 
+	#include "../server/t_jumppads.qh"
+
+	float PM_multijump_checkjump();
+	void PM_multijump();
+    .float speed;
+    .float watertype;
+    .float jumppadcount;
+    .float ladder_time;
+    .entity ladder_entity;
+
 	float player_multijump;
 	float player_jumpheight;
 
@@ -104,6 +134,28 @@
 
 #elif defined(SVQC)
 
+	.float stat_sv_airaccel_qw;
+	.float stat_sv_airstrafeaccel_qw;
+	.float stat_sv_airspeedlimit_nonqw;
+	.float stat_sv_maxspeed;
+	.float stat_movement_highspeed;
+
+	.float stat_sv_friction_on_land;
+	.float stat_sv_friction_slick;
+
+	.float stat_doublejump;
+
+	.float stat_jumpspeedcap_min;
+	.float stat_jumpspeedcap_max;
+	.float stat_jumpspeedcap_disable_onramps;
+
+	.float stat_jetpack_accel_side;
+	.float stat_jetpack_accel_up;
+	.float stat_jetpack_antigravity;
+	.float stat_jetpack_fuel;
+	.float stat_jetpack_maxspeed_up;
+	.float stat_jetpack_maxspeed_side;
+
 	#define PHYS_INPUT_ANGLES(s)				s.v_angle
 	#define PHYS_WORLD_ANGLES(s)				s.angles
 
@@ -133,8 +185,8 @@
 	#define GAMEPLAYFIX_Q2AIRACCELERATE				autocvar_sv_gameplayfix_q2airaccelerate
 
 	#define IS_DUCKED(s)    					s.crouch
-	#define SET_DUCKED(s)   					s.crouch = TRUE
-	#define UNSET_DUCKED(s) 					s.crouch = FALSE
+	#define SET_DUCKED(s)   					s.crouch = true
+	#define UNSET_DUCKED(s) 					s.crouch = false
 
 	#define IS_JUMP_HELD(s)    					!(s.flags & FL_JUMPRELEASED)
 	#define SET_JUMP_HELD(s)   					s.flags &= ~FL_JUMPRELEASED
@@ -198,4 +250,5 @@
 
 	#define PHYS_DODGING_FROZEN					autocvar_sv_dodging_frozen
 
-#endif
\ No newline at end of file
+#endif
+#endif