X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_physics.qc;h=79087eb8a366e9a5ed91c67de9024d058ef3140f;hp=b7e8bc22648b631647bf33898c4be713dc3d46f9;hb=616650bb18362024afeed71fed91d33dc1708d09;hpb=c6b0bfd9440e9baad268f9409ec6de5c3d56d06f

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index b7e8bc226..79087eb8a 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -171,7 +171,7 @@ void PlayerJump (void)
 
 	if (self.crouch)
 		setanim(self, self.anim_duckjump, FALSE, TRUE, TRUE);
-	else
+	else if (self.animstate_startframe != self.anim_melee_x || (self.animstate_startframe == self.anim_melee_x && time - self.animstate_starttime >= 21/20)) // jump animation shouldn't override melee until we have animation blending (or until the anim finished, 21/20 = numframes/fps)
 		setanim(self, self.anim_jump, FALSE, TRUE, TRUE);
 
 	if(g_jump_grunt)
@@ -182,7 +182,7 @@ void PlayerJump (void)
 }
 void CheckWaterJump()
 {
-	local vector start, end;
+	vector start, end;
 
 // check for a jump-out-of-water
 	makevectors (self.angles);
@@ -207,7 +207,7 @@ void CheckWaterJump()
 			return;
 		}
 	}
-};
+}
 void CheckPlayerJump()
 {
 	if(self.flags & FL_ONGROUND)
@@ -697,8 +697,8 @@ float speedaward_lastupdate;
 float speedaward_lastsent;
 void SV_PlayerPhysics()
 {
-	local vector wishvel, wishdir, v;
-	local float wishspeed, f, maxspd_mod, spd, maxairspd, airaccel, swampspd_mod, buttons;
+	vector wishvel, wishdir, v;
+	float wishspeed, f, maxspd_mod, spd, maxairspd, airaccel, swampspd_mod, buttons;
 	string temps;
 	float buttons_prev;
 	float not_allowed_to_move;
@@ -732,6 +732,7 @@ void SV_PlayerPhysics()
 	maxspd_mod *= autocvar_g_movement_highspeed;
 
 	// fix physics stats for g_movement_highspeed
+	// TODO maybe rather use maxairspeed? needs testing
 	self.stat_sv_airaccel_qw = AdjustAirAccelQW(autocvar_sv_airaccel_qw, maxspd_mod);
 	if(autocvar_sv_airstrafeaccel_qw)
 		self.stat_sv_airstrafeaccel_qw = AdjustAirAccelQW(autocvar_sv_airstrafeaccel_qw, maxspd_mod);
@@ -881,6 +882,10 @@ void SV_PlayerPhysics()
 		swampspd_mod = self.swamp_slowdown; //cvar("g_balance_swamp_moverate");
 	}
 
+	// conveyors: first fix velocity
+	if(self.conveyor.state)
+		self.velocity -= self.conveyor.movedir;
+
 	if(self.classname != "player")
 	{
 		maxspd_mod = autocvar_sv_spectator_speed_multiplier;
@@ -1210,6 +1215,28 @@ void SV_PlayerPhysics()
 				self.velocity = self.velocity * f;
 			else
 				self.velocity = '0 0 0';
+			/*
+			   Mathematical analysis time!
+
+			   Our goal is to invert this mess.
+
+			   For the two cases we get:
+			   	v = v0 * (1 - frametime * (autocvar_sv_stopspeed / v0) * autocvar_sv_friction)
+			   	  = v0 - frametime * autocvar_sv_stopspeed * autocvar_sv_friction
+				v0 = v + frametime * autocvar_sv_stopspeed * autocvar_sv_friction
+			   and
+			   	v = v0 * (1 - frametime * autocvar_sv_friction)
+			   	v0 = v / (1 - frametime * autocvar_sv_friction)
+
+			   These cases would be chosen ONLY if:
+			   	v0 < autocvar_sv_stopspeed
+				v + frametime * autocvar_sv_stopspeed * autocvar_sv_friction < autocvar_sv_stopspeed
+				v < autocvar_sv_stopspeed * (1 - frametime * autocvar_sv_friction)
+			   and, respectively:
+			   	v0 >= autocvar_sv_stopspeed
+			   	v / (1 - frametime * autocvar_sv_friction) >= autocvar_sv_stopspeed
+			   	v >= autocvar_sv_stopspeed * (1 - frametime * autocvar_sv_friction)
+			 */
 		}
 
 		// acceleration
@@ -1338,6 +1365,10 @@ void SV_PlayerPhysics()
 	if(self.flags & FL_ONGROUND)
 		self.lastground = time;
 
+	// conveyors: then break velocity again
+	if(self.conveyor.state)
+		self.velocity += self.conveyor.movedir;
+
 	self.lastflags = self.flags;
 	self.lastclassname = self.classname;
-};
+}