X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_input.c;h=357ce6c5c9db5909ee733483c0eac100e6282028;hb=5a62228b228e2a329d2ba7fef9dacd12de4d9033;hp=d9a061658a912dcaf0b75a6298391d5f7ffd9d50;hpb=544356c7bb6288760533142b8ab402f4d8d966ef;p=xonotic%2Fdarkplaces.git

diff --git a/cl_input.c b/cl_input.c
index d9a06165..357ce6c5 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -274,9 +274,12 @@ cvar_t cl_movement_maxspeed = {0, "cl_movement_maxspeed", "320", "how fast you c
 cvar_t cl_movement_maxairspeed = {0, "cl_movement_maxairspeed", "30", "how fast you can move while in the air (should match sv_maxairspeed)"};
 cvar_t cl_movement_stopspeed = {0, "cl_movement_stopspeed", "100", "speed below which you will be slowed rapidly to a stop rather than sliding endlessly (should match sv_stopspeed)"};
 cvar_t cl_movement_friction = {0, "cl_movement_friction", "4", "how fast you slow down (should match sv_friction)"};
+cvar_t cl_movement_waterfriction = {0, "cl_movement_waterfriction", "-1", "how fast you slow down (should match sv_friction), if less than 0 the cl_movement_friction variable is used instead"};
 cvar_t cl_movement_edgefriction = {0, "cl_movement_edgefriction", "2", "how much to slow down when you may be about to fall off a ledge (should match edgefriction)"};
 cvar_t cl_movement_stepheight = {0, "cl_movement_stepheight", "18", "how tall a step you can step in one instant (should match sv_stepheight)"};
 cvar_t cl_movement_accelerate = {0, "cl_movement_accelerate", "10", "how fast you accelerate (should match sv_accelerate)"};
+cvar_t cl_movement_airaccelerate = {0, "cl_movement_airaccelerate", "-1", "how fast you accelerate while in the air (should match sv_airaccelerate), if less than 0 the cl_movement_accelerate variable is used instead"};
+cvar_t cl_movement_wateraccelerate = {0, "cl_movement_wateraccelerate", "-1", "how fast you accelerate while in the air (should match sv_airaccelerate), if less than 0 the cl_movement_accelerate variable is used instead"};
 cvar_t cl_movement_jumpvelocity = {0, "cl_movement_jumpvelocity", "270", "how fast you move upward when you begin a jump (should match the quakec code)"};
 cvar_t cl_gravity = {0, "cl_gravity", "800", "how much gravity to apply in client physics (should match sv_gravity)"};
 cvar_t cl_slowmo = {0, "cl_slowmo", "1", "speed of game time (should match slowmo)"};
@@ -520,8 +523,12 @@ void CL_ClientMovement_InputQW(qw_usercmd_t *cmd)
 	n = cl.movement_numqueue;
 	cl.movement_numqueue = 0;
 	for (i = 0;i < n;i++)
+	{
 		if (cl.movement_queue[i].sequence > cls.netcon->qw.incoming_sequence)
 			cl.movement_queue[cl.movement_numqueue++] = cl.movement_queue[i];
+		else if (i == 0)
+			cl.movement_replay_canjump = !cl.movement_queue[i].jump; // FIXME: this logic is quite broken
+	}
 	// add to input queue if there is room
 	if (cl.movement_numqueue < (int)(sizeof(cl.movement_queue)/sizeof(cl.movement_queue[0])))
 	{
@@ -544,21 +551,29 @@ void CL_ClientMovement_Input(qboolean buttonjump, qboolean buttoncrouch)
 {
 	int i;
 	int n;
-	double lasttime = cl.movement_numqueue >= 0 ? cl.movement_queue[cl.movement_numqueue - 1].time : 0;
+	double lasttime = (cls.protocol == PROTOCOL_DARKPLACES6 || cls.protocol == PROTOCOL_DARKPLACES7) ? cl.mtime[1] : (cl.movement_numqueue >= 0 ? cl.movement_queue[cl.movement_numqueue - 1].time : 0);
 	// remove stale queue items
 	n = cl.movement_numqueue;
 	cl.movement_numqueue = 0;
 	if (cl.servermovesequence)
 	{
 		for (i = 0;i < n;i++)
+		{
 			if (cl.movement_queue[i].sequence > cl.servermovesequence)
 				cl.movement_queue[cl.movement_numqueue++] = cl.movement_queue[i];
+			else if (i == 0)
+				cl.movement_replay_canjump = !cl.movement_queue[i].jump; // FIXME: this logic is quite broken
+		}
 	}
 	else
 	{
 		for (i = 0;i < n;i++)
+		{
 			if (cl.movement_queue[i].time >= cl.mtime[0] - cl_movement_latency.value / 1000.0 && cl.movement_queue[i].time <= cl.mtime[0])
 				cl.movement_queue[cl.movement_numqueue++] = cl.movement_queue[i];
+			else if (i == 0)
+				cl.movement_replay_canjump = !cl.movement_queue[i].jump; // FIXME: this logic is quite broken
+		}
 	}
 	// add to input queue if there is room
 	if (cl.movement_numqueue < (int)(sizeof(cl.movement_queue)/sizeof(cl.movement_queue[0])) && cl.mtime[0] > cl.mtime[1])
@@ -910,7 +925,7 @@ void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
 
 	// jump if on ground with jump button pressed but only if it has been
 	// released at least once since the last jump
-	if (s->q.jump && s->canjump && s->onground)
+	if (s->q.jump && s->onground)// && s->canjump) // FIXME: canjump doesn't work properly
 	{
 		s->velocity[2] += s->movevars_jumpvelocity;
 		s->onground = false;
@@ -1019,7 +1034,7 @@ void CL_ClientMovement_Replay(void)
 	VectorCopy(cl.entities[cl.playerentity].state_current.origin, s.origin);
 	VectorCopy(cl.mvelocity[0], s.velocity);
 	s.crouched = true; // will be updated on first move
-	s.canjump = true;
+	s.canjump = cl.movement_replay_canjump;
 
 	// set up movement variables
 	if (cls.protocol == PROTOCOL_QUAKEWORLD)
@@ -1046,10 +1061,10 @@ void CL_ClientMovement_Replay(void)
 		s.movevars_maxspeed = cl_movement_maxspeed.value;
 		s.movevars_spectatormaxspeed = cl_movement_maxspeed.value;
 		s.movevars_accelerate = cl_movement_accelerate.value;
-		s.movevars_airaccelerate = cl_movement_accelerate.value;
-		s.movevars_wateraccelerate = cl_movement_accelerate.value;
+		s.movevars_airaccelerate = cl_movement_airaccelerate.value < 0 ? cl_movement_accelerate.value : cl_movement_airaccelerate.value;
+		s.movevars_wateraccelerate = cl_movement_wateraccelerate.value < 0 ? cl_movement_accelerate.value : cl_movement_wateraccelerate.value;
 		s.movevars_friction = cl_movement_friction.value;
-		s.movevars_waterfriction = cl_movement_friction.value;
+		s.movevars_waterfriction = cl_movement_waterfriction.value < 0 ? cl_movement_friction.value : cl_movement_waterfriction.value;
 		s.movevars_entgravity = 1;
 		s.movevars_jumpvelocity = cl_movement_jumpvelocity.value;
 		s.movevars_edgefriction = cl_movement_edgefriction.value;
@@ -1057,7 +1072,8 @@ void CL_ClientMovement_Replay(void)
 		s.movevars_stepheight = cl_movement_stepheight.value;
 	}
 
-	if (cl.movement)
+	cl.movement_predicted = (cl_movement.integer && cls.signon == SIGNONS && cl.stats[STAT_HEALTH] > 0 && !cl.intermission) && ((cls.protocol != PROTOCOL_DARKPLACES6 && cls.protocol != PROTOCOL_DARKPLACES7) || cl.servermovesequence);
+	if (cl.movement_predicted)
 	{
 		//Con_Printf("%f: ", cl.mtime[0]);
 
@@ -1167,7 +1183,6 @@ void CL_SendMove(void)
 	accumtotal++;
 #endif
 
-	cl.movement = cl_movement.integer && cls.signon == SIGNONS && cl.stats[STAT_HEALTH] > 0 && !cl.intermission;
 	if (cl_movement.integer && cls.signon == SIGNONS && cls.protocol != PROTOCOL_QUAKEWORLD)
 	{
 		if (!cl.movement_needupdate)