X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fecs%2Fsystems%2Fphysics.qc;h=cd59c516c991386d6f6d8e7ef6c78353b3921658;hp=ae5f119e7fe8db0eea039a57032af553cd4d7d24;hb=da20c91cdf9b61e6519db605a14b1676a2448987;hpb=2c32015574cc6afc12cc8ac9fb620edf3caf6d2b;ds=sidebyside

diff --git a/qcsrc/ecs/systems/physics.qc b/qcsrc/ecs/systems/physics.qc
index ae5f119e7..cd59c516c 100644
--- a/qcsrc/ecs/systems/physics.qc
+++ b/qcsrc/ecs/systems/physics.qc
@@ -33,7 +33,12 @@ void sys_phys_update(entity this, float dt)
 	if (IS_SVQC) {
 		if (this.move_movetype == MOVETYPE_NONE) { return; }
 		// when we get here, disableclientprediction cannot be 2
-		this.disableclientprediction = (this.move_qcphysics) ? -1 : 0;
+		if(this.move_movetype == MOVETYPE_FOLLOW) // not compatible with prediction
+			this.disableclientprediction = 1;
+		else if(this.move_qcphysics)
+			this.disableclientprediction = -1;
+		else
+			this.disableclientprediction = 0;
 	}
 
 	viewloc_PlayerPhysics(this);
@@ -126,7 +131,7 @@ void sys_phys_update(entity this, float dt)
 		this.com_phys_gravity = '0 0 0';
 	} else if (ITEMS_STAT(this) & IT_USING_JETPACK) {
 		PM_jetpack(this, maxspeed_mod, dt);
-	} else if (IS_ONGROUND(this)) {
+	} else if (IS_ONGROUND(this) && (!IS_ONSLICK(this) || !PHYS_SLICK_APPLYGRAVITY(this))) {
 		if (!WAS_ONGROUND(this)) {
 			emit(phys_land, this);
 			if (this.lastground < time - 0.3) {
@@ -193,8 +198,8 @@ void sys_phys_simulate(entity this, float dt)
 		// this mimics quakeworld code
 		if (this.com_in_jump && this.waterlevel == WATERLEVEL_SWIMMING && this.velocity_z >= -180 && !this.viewloc) {
 			vector yawangles = '0 1 0' * this.v_angle.y;
-			makevectors(yawangles);
-			vector forward = v_forward;
+			vector forward, right, up;
+			MAKE_VECTORS(yawangles, forward, right, up);
 			vector spot = this.origin + 24 * forward;
 			spot_z += 8;
 			traceline(spot, spot, MOVE_NOMONSTERS, this);
@@ -210,10 +215,12 @@ void sys_phys_simulate(entity this, float dt)
 			}
 		}
 	}
-	makevectors(vmul(this.v_angle, (this.com_phys_vel_2d ? '0 1 0' : '1 1 1')));
-	// wishvel = v_forward * PHYS_CS(this).movement.x + v_right * PHYS_CS(this).movement.y + v_up * PHYS_CS(this).movement.z;
-	vector wishvel = v_forward * PHYS_CS(this).movement.x
-	    + v_right * PHYS_CS(this).movement.y
+
+	vector forward, right, up;
+	MAKE_VECTORS(vmul(this.v_angle, (this.com_phys_vel_2d ? '0 1 0' : '1 1 1')), forward, right, up);
+	// wishvel = forward * PHYS_CS(this).movement.x + right * PHYS_CS(this).movement.y + up * PHYS_CS(this).movement.z;
+	vector wishvel = forward * PHYS_CS(this).movement.x
+	    + right * PHYS_CS(this).movement.y
 	    + '0 0 1' * PHYS_CS(this).movement.z * (this.com_phys_vel_2d ? 0 : 1);
 	if (this.com_phys_water) {
 		if (PHYS_INPUT_BUTTON_CROUCH(this)) {
@@ -358,11 +365,9 @@ void sys_phys_simulate(entity this, float dt)
 			// apply edge friction
 			const float f2 = vlen2(vec2(this.velocity));
 			if (f2 > 0) {
-				trace_dphitq3surfaceflags = 0;
-				tracebox(this.origin, this.mins, this.maxs, this.origin - '0 0 1', MOVE_NOMONSTERS, this);
 				// TODO: apply edge friction
 				// apply ground friction
-				const int realfriction = (trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK)
+				const int realfriction = (IS_ONSLICK(this))
 				    ? PHYS_FRICTION_SLICK(this)
 					: PHYS_FRICTION(this);