X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics%2Fmovetypes%2Fwalk.qc;h=c0f2fac9640be94fa6c550536f029c2197180e38;hb=780df3d4c8c05a74b64af03b46794e6cbc65fa19;hp=45b1dc39ccbe4c18a978a617bc7b90120df357b1;hpb=a47688cb559bcb2090d69a3a3c0c92d4d8fe02d5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/physics/movetypes/walk.qc b/qcsrc/common/physics/movetypes/walk.qc
index 45b1dc39c..c0f2fac96 100644
--- a/qcsrc/common/physics/movetypes/walk.qc
+++ b/qcsrc/common/physics/movetypes/walk.qc
@@ -1,3 +1,4 @@
+#include "walk.qh"
 void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 {
 	vector stepnormal = '0 0 0';
@@ -7,7 +8,7 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 		return;
 
 	if (GAMEPLAYFIX_UNSTICKPLAYERS(this))
-		_Movetype_UnstickEntity(this);
+		_Movetype_CheckStuck(this);
 
 	bool applygravity = (!_Movetype_CheckWater(this) && this.move_movetype == MOVETYPE_WALK && !(this.flags & FL_WATERJUMP));
 
@@ -19,6 +20,14 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 	vector start_origin = this.origin;
 	vector start_velocity = this.velocity;
 
+	if(PHYS_WALLCLIP(this) && this.pm_time)
+	{
+		if(dt >= this.pm_time || (this.flags & FL_WATERJUMP))
+			this.pm_time = 0;
+		else
+			this.pm_time -= dt;
+	}
+
 	int clip = _Movetype_FlyMove(this, dt, applygravity, stepnormal, GAMEPLAYFIX_STEPMULTIPLETIMES(this) ? PHYS_STEPHEIGHT(this) : 0);
 
 	if (GAMEPLAYFIX_DOWNTRACEONGROUND(this) && !(clip & 1))
@@ -44,6 +53,8 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 	// if the move did not hit the ground at any point, we're not on ground
 	if (!(clip & 1))
 		UNSET_ONGROUND(this);
+	else if(PHYS_WALLCLIP(this) && !this.groundentity && (PHYS_WALLCLIP(this) == 2 || start_velocity.z < -200)) // don't do landing time if we were just going down a slope
+		this.pm_time = 0.25;
 
 	_Movetype_CheckVelocity(this);
 	_Movetype_LinkEdict(this, true);
@@ -61,7 +72,7 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 	vector originalvelocity = this.velocity;
 	// originalmove_clip = clip;
 	int originalflags = this.flags;
-	entity originalmove_groundentity = this.move_groundentity;
+	entity originalmove_groundentity = this.groundentity;
 
 	// if move didn't block on a step, return
 	if (clip & 2)
@@ -124,7 +135,7 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 			this.velocity = originalvelocity;
 			// clip = originalmove_clip;
 			this.flags = originalflags;
-			this.move_groundentity = originalmove_groundentity;
+			this.groundentity = originalmove_groundentity;
 			// now try to unstick if needed
 			// clip = SV_TryUnstick (ent, oldvel);
 			return;
@@ -143,7 +154,8 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 	}
 
 	// move down
-	vector downmove = '0 0 1' * (-PHYS_STEPHEIGHT(this) + start_velocity.z * dt);
+	vector downmove = '0 0 0';
+	downmove.z = -PHYS_STEPHEIGHT(this) + start_velocity.z * dt;
 	_Movetype_PushEntity(this, downmove, true);
 	if(wasfreed(this))
 		return;
@@ -158,6 +170,13 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 	{
 		// this has been disabled so that you can't jump when you are stepping
 		// up while already jumping (also known as the Quake2 double jump bug)
+		// LordHavoc: disabled this check so you can walk on monsters/players
+		//if (PRVM_serveredictfloat(ent, solid) == SOLID_BSP)
+		if(GAMEPLAYFIX_STEPDOWN(this) == 2)
+		{
+			SET_ONGROUND(this);
+			this.groundentity = trace_ent;
+		}
 	}
 	else
 	{
@@ -168,7 +187,7 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 		this.origin = originalorigin;
 		this.velocity = originalvelocity;
 		this.flags = originalflags;
-		this.move_groundentity = originalmove_groundentity;
+		this.groundentity = originalmove_groundentity;
 	}
 
 	_Movetype_CheckVelocity(this);