X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_user.c;h=decd9e54cd25999535308dfb9463f7dbbec966fc;hp=f251a8bc0c4db2c7ac019596679eccb98a69fb92;hb=545926ff9670b675714b3b2d8acbfe19e08483f3;hpb=919fbb05eeafd41c867b1f39bb2cc9e5dd61077e

diff --git a/sv_user.c b/sv_user.c
index f251a8bc..decd9e54 100644
--- a/sv_user.c
+++ b/sv_user.c
@@ -20,16 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // sv_user.c -- server code for moving users
 
 #include "quakedef.h"
-
-cvar_t sv_edgefriction = {0, "edgefriction", "2"};
-cvar_t sv_deltacompress = {0, "sv_deltacompress", "1"};
-cvar_t sv_idealpitchscale = {0, "sv_idealpitchscale","0.8"};
-cvar_t sv_maxspeed = {CVAR_NOTIFY, "sv_maxspeed", "320"};
-cvar_t sv_accelerate = {0, "sv_accelerate", "10"};
+#define DEBUGMOVES 0
 
 static usercmd_t cmd;
 
-
 /*
 ===============
 SV_SetIdealPitch
@@ -38,12 +32,12 @@ SV_SetIdealPitch
 #define	MAX_FORWARD	6
 void SV_SetIdealPitch (void)
 {
-	float	angleval, sinval, cosval;
+	float	angleval, sinval, cosval, step, dir;
 	trace_t	tr;
 	vec3_t	top, bottom;
 	float	z[MAX_FORWARD];
 	int		i, j;
-	int		step, dir, steps;
+	int		steps;
 
 	if (!((int)host_client->edict->fields.server->flags & FL_ONGROUND))
 		return;
@@ -62,7 +56,7 @@ void SV_SetIdealPitch (void)
 		bottom[1] = top[1];
 		bottom[2] = top[2] - 160;
 
-		tr = SV_Move (top, vec3_origin, vec3_origin, bottom, MOVE_NOMONSTERS, host_client->edict);
+		tr = SV_Move (top, vec3_origin, vec3_origin, bottom, MOVE_NOMONSTERS, host_client->edict, SUPERCONTENTS_SOLID);
 		// if looking at a wall, leave ideal the way is was
 		if (tr.startsolid)
 			return;
@@ -101,7 +95,6 @@ void SV_SetIdealPitch (void)
 	host_client->edict->fields.server->idealpitch = -dir * sv_idealpitchscale.value;
 }
 
-#if 1
 static vec3_t wishdir, forward, right, up;
 static float wishspeed;
 
@@ -129,7 +122,7 @@ void SV_UserFriction (void)
 	start[2] = host_client->edict->fields.server->origin[2] + host_client->edict->fields.server->mins[2];
 	stop[2] = start[2] - 34;
 
-	trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, host_client->edict);
+	trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, host_client->edict, SV_GenericHitSuperContentsMask(host_client->edict));
 
 	if (trace.fraction == 1.0)
 		friction = sv_friction.value*sv_edgefriction.value;
@@ -176,13 +169,13 @@ void SV_AirAccelerate (vec3_t wishveloc)
 	float addspeed, wishspd, accelspeed, currentspeed;
 
 	wishspd = VectorNormalizeLength (wishveloc);
-	if (wishspd > 30)
-		wishspd = 30;
+	if (wishspd > sv_maxairspeed.value)
+		wishspd = sv_maxairspeed.value;
 	currentspeed = DotProduct (host_client->edict->fields.server->velocity, wishveloc);
 	addspeed = wishspd - currentspeed;
 	if (addspeed <= 0)
 		return;
-	accelspeed = sv_accelerate.value*wishspeed * sv.frametime;
+	accelspeed = (sv_airaccelerate.value < 0 ? sv_accelerate.value : sv_airaccelerate.value)*wishspeed * sv.frametime;
 	if (accelspeed > addspeed)
 		accelspeed = addspeed;
 
@@ -203,7 +196,7 @@ void DropPunchAngle (void)
 		len = 0;
 	VectorScale (host_client->edict->fields.server->punchangle, len, host_client->edict->fields.server->punchangle);
 
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_punchvector)))
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.punchvector)))
 	{
 		len = VectorNormalizeLength (val->vector);
 
@@ -272,7 +265,7 @@ void SV_WaterMove (void)
 	speed = VectorLength(host_client->edict->fields.server->velocity);
 	if (speed)
 	{
-		newspeed = speed - sv.frametime * speed * sv_friction.value;
+		newspeed = speed - sv.frametime * speed * (sv_waterfriction.value < 0 ? sv_friction.value : sv_waterfriction.value);
 		if (newspeed < 0)
 			newspeed = 0;
 		temp = newspeed/speed;
@@ -290,7 +283,7 @@ void SV_WaterMove (void)
 		return;
 
 	VectorNormalize (wishvel);
-	accelspeed = sv_accelerate.value * wishspeed * sv.frametime;
+	accelspeed = (sv_wateraccelerate.value < 0 ? sv_accelerate.value : sv_wateraccelerate.value) * wishspeed * sv.frametime;
 	if (accelspeed > addspeed)
 		accelspeed = addspeed;
 
@@ -354,7 +347,7 @@ void SV_AirMove (void)
 		// noclip
 		VectorCopy (wishvel, host_client->edict->fields.server->velocity);
 	}
-	else if ( onground )
+	else if (onground && (!sv_gameplayfix_qwplayerphysics.integer || !host_client->edict->fields.server->button2 || !((int)host_client->edict->fields.server->flags & FL_JUMPRELEASED)))
 	{
 		SV_UserFriction ();
 		SV_Accelerate ();
@@ -378,6 +371,20 @@ void SV_ClientThink (void)
 {
 	vec3_t v_angle;
 
+	SV_ApplyClientMove();
+	// make sure the velocity is sane (not a NaN)
+	SV_CheckVelocity(host_client->edict);
+
+	// LordHavoc: QuakeC replacement for SV_ClientThink (player movement)
+	if (prog->funcoffsets.SV_PlayerPhysics && sv_playerphysicsqc.integer)
+	{
+		prog->globals.server->time = sv.time;
+		prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
+		PRVM_ExecuteProgram (prog->funcoffsets.SV_PlayerPhysics, "QC function SV_PlayerPhysics is missing");
+		SV_CheckVelocity(host_client->edict);
+		return;
+	}
+
 	if (host_client->edict->fields.server->movetype == MOVETYPE_NONE)
 		return;
 
@@ -404,6 +411,7 @@ void SV_ClientThink (void)
 	if ( (int)host_client->edict->fields.server->flags & FL_WATERJUMP )
 	{
 		SV_WaterJump ();
+		SV_CheckVelocity(host_client->edict);
 		return;
 	}
 
@@ -421,211 +429,49 @@ void SV_ClientThink (void)
 	if ((host_client->edict->fields.server->waterlevel >= 2) && (host_client->edict->fields.server->movetype != MOVETYPE_NOCLIP))
 	{
 		SV_WaterMove ();
+		SV_CheckVelocity(host_client->edict);
 		return;
 	}
 
 	SV_AirMove ();
+	SV_CheckVelocity(host_client->edict);
 }
 
-#else
-
-extern cvar_t cl_rollspeed;
-extern cvar_t cl_rollangle;
-void SV_ClientThink(void)
-{
-	int j;
-	vec3_t wishvel, wishdir, v, v_forward, v_right, v_up, start, stop;
-	float wishspeed, f, limit;
-	trace_t trace;
-
-	if (host_client->edict->fields.server->movetype == MOVETYPE_NONE)
-		return;
-
-	f = DotProduct(host_client->edict->fields.server->punchangle, host_client->edict->fields.server->punchangle);
-	if (f)
-	{
-		limit = sqrt(f);
-		f = (limit - 10 * sv.frametime);
-		f /= limit;
-		f = max(0, f);
-		VectorScale(host_client->edict->fields.server->punchangle, f, host_client->edict->fields.server->punchangle);
-	}
-
-	// if dead, behave differently
-	if (host_client->edict->fields.server->health <= 0)
-		return;
-
-	AngleVectors(host_client->edict->fields.server->v_angle, v_forward, v_right, v_up);
-	// show 1/3 the pitch angle and all the roll angle
-	f = DotProduct(host_client->edict->fields.server->velocity, v_right) * (1.0 / cl_rollspeed.value);
-	host_client->edict->fields.server->angles[2] = bound(-1, f, 1) * cl_rollangle.value * 4;
-	if (!host_client->edict->fields.server->fixangle)
-	{
-		host_client->edict->fields.server->angles[0] = (host_client->edict->fields.server->v_angle[0] + host_client->edict->fields.server->punchangle[0]) * -0.333;
-		host_client->edict->fields.server->angles[1] = host_client->edict->fields.server->v_angle[1] + host_client->edict->fields.server->punchangle[1];
-	}
-
-	if ((int)host_client->edict->fields.server->flags & FL_WATERJUMP)
-	{
-		host_client->edict->fields.server->velocity[0] = host_client->edict->fields.server->movedir[0];
-		host_client->edict->fields.server->velocity[1] = host_client->edict->fields.server->movedir[1];
-		if (sv.time > host_client->edict->fields.server->teleport_time || host_client->edict->fields.server->waterlevel == 0)
-		{
-			host_client->edict->fields.server->flags = (int)host_client->edict->fields.server->flags - ((int)host_client->edict->fields.server->flags & FL_WATERJUMP);
-			host_client->edict->fields.server->teleport_time = 0;
-		}
-		return;
-	}
-
-	// swim
-	if (host_client->edict->fields.server->waterlevel >= 2)
-	if (host_client->edict->fields.server->movetype != MOVETYPE_NOCLIP)
-	{
-		if (host_client->cmd.forwardmove == 0 && host_client->cmd.sidemove == 0 && host_client->cmd.upmove == 0)
-		{
-			// drift towards bottom
-			wishvel[0] = 0;
-			wishvel[1] = 0;
-			wishvel[2] = -60;
-		}
-		else
-		{
-			for (j = 0;j < 3;j++)
-				wishvel[j] = v_forward[j] * host_client->cmd.forwardmove + v_right[j] * host_client->cmd.sidemove;
-			wishvel[2] += host_client->cmd.upmove;
-		}
-
-		wishspeed = VectorLength(wishvel);
-		wishspeed = min(wishspeed, sv_maxspeed.value) * 0.7;
-
-		// water friction
-		f = VectorLength(host_client->edict->fields.server->velocity) * (1 - sv.frametime * sv_friction.value);
-		if (f > 0)
-			f /= VectorLength(host_client->edict->fields.server->velocity);
-		else
-			f = 0;
-		VectorScale(host_client->edict->fields.server->velocity, f, host_client->edict->fields.server->velocity);
-
-		// water acceleration
-		if (wishspeed <= f)
-			return;
-
-		f = wishspeed - f;
-		limit = sv_accelerate.value * wishspeed * sv.frametime;
-		if (f > limit)
-			f = limit;
-		limit = VectorLength(wishvel);
-		if (limit)
-			f /= limit;
-		VectorMA(host_client->edict->fields.server->velocity, f, wishvel, host_client->edict->fields.server->velocity);
-		return;
-	}
-
-	// if not flying, move horizontally only
-	if (host_client->edict->fields.server->movetype != MOVETYPE_FLY)
-	{
-		VectorClear(wishvel);
-		wishvel[1] = host_client->edict->fields.server->v_angle[1];
-		AngleVectors(wishvel, v_forward, v_right, v_up);
-	}
-
-	// hack to not let you back into teleporter
-	VectorScale(v_right, host_client->cmd.sidemove, wishvel);
-	if (sv.time >= host_client->edict->fields.server->teleport_time || host_client->cmd.forwardmove > 0)
-		VectorMA(wishvel, host_client->cmd.forwardmove, v_forward, wishvel);
-	if (host_client->edict->fields.server->movetype != MOVETYPE_WALK)
-		wishvel[2] += cmd.upmove;
-
-	VectorCopy(wishvel, wishdir);
-	VectorNormalize(wishdir);
-	wishspeed = VectorLength(wishvel);
-	if (wishspeed > sv_maxspeed.value)
-		wishspeed = sv_maxspeed.value;
-
-	if (host_client->edict->fields.server->movetype == MOVETYPE_NOCLIP || host_client->edict->fields.server->movetype == MOVETYPE_FLY)
-	{
-		VectorScale(wishdir, wishspeed, host_client->edict->fields.server->velocity);
-		return;
-	}
-
-	if ((int)host_client->edict->fields.server->flags & FL_ONGROUND) // walking
-	{
-		// friction
-		f = host_client->edict->fields.server->velocity[0] * host_client->edict->fields.server->velocity[0] + host_client->edict->fields.server->velocity[1] * host_client->edict->fields.server->velocity[1];
-		if (f)
-		{
-			f = sqrt(f);
-			VectorCopy(host_client->edict->fields.server->velocity, v);
-			v[2] = 0;
-
-			// if the leading edge is over a dropoff, increase friction
-			limit = 16.0f / f;
-			VectorMA(host_client->edict->fields.server->origin, limit, v, v);
-			v[2] += host_client->edict->fields.server->mins[2];
-
-			VectorCopy(v, start);
-			VectorCopy(v, stop);
-			stop[2] -= 34;
-			trace = SV_Move(start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, host_client->edict);
-
-			// apply friction
-			if (f < sv_stopspeed.value)
-				f = sv_stopspeed.value / f;
-			else
-				f = 1;
-			if (trace.fraction == 1)
-				f *= sv_edgefriction.value;
-			f = 1 - sv.frametime * f * sv_friction.value;
-
-			if (f < 0)
-				f = 0;
-			VectorScale(host_client->edict->fields.server->velocity, f, host_client->edict->fields.server->velocity);
-		}
-	}
-	else // airborn
-		wishspeed = min(wishspeed, 30);
-
-	// ground or air acceleration
-	f = wishspeed - DotProduct(host_client->edict->fields.server->velocity, wishdir);
-	if (f > 0)
-	{
-		limit = sv_accelerate.value * sv.frametime * wishspeed;
-		if (f > limit)
-			f = limit;
-		VectorMA(host_client->edict->fields.server->velocity, f, wishdir, host_client->edict->fields.server->velocity);
-	}
-}
-#endif
-
 /*
 ===================
 SV_ReadClientMove
 ===================
 */
-extern void SV_Physics_Entity (prvm_edict_t *ent, qboolean runmove);
-void SV_ApplyClientMove (void);
+int sv_numreadmoves = 0;
+usercmd_t sv_readmoves[CL_MAX_USERCMDS];
 void SV_ReadClientMove (void)
 {
 	int i;
-	double oldmovetime;
-	usercmd_t *move = &host_client->cmd;
+	usercmd_t newmove;
+	usercmd_t *move = &newmove;
 
-	oldmovetime = move->time;
-	memset(move, 0, sizeof(usercmd_t));
+	memset(move, 0, sizeof(*move));
 
 	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 
 	// read ping time
-	if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5 && sv.protocol != PROTOCOL_DARKPLACES6)
+	if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3 && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5 && sv.protocol != PROTOCOL_DARKPLACES6)
 		move->sequence = MSG_ReadLong ();
 	move->time = MSG_ReadFloat ();
 	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
-	move->receivetime = sv.time;
+	move->receivetime = (float)sv.time;
+
+#if DEBUGMOVES
+	Con_Printf("%s move%i #%i %ims (%ims) %i %i '%i %i %i' '%i %i %i'\n", move->time > move->receivetime ? "^3read future" : "^4read normal", sv_numreadmoves + 1, move->sequence, (int)floor((move->time - host_client->cmd.time) * 1000.0 + 0.5), (int)floor(move->time * 1000.0 + 0.5), move->impulse, move->buttons, (int)move->viewangles[0], (int)move->viewangles[1], (int)move->viewangles[2], (int)move->forwardmove, (int)move->sidemove, (int)move->upmove);
+#endif
+	// limit reported time to current time
+	// (incase the client is trying to cheat)
+	move->time = min(move->time, move->receivetime + sv.frametime);
 
 	// read current angles
 	for (i = 0;i < 3;i++)
 	{
-		if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE)
+		if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3)
 			move->viewangles[i] = MSG_ReadAngle8i();
 		else if (sv.protocol == PROTOCOL_DARKPLACES1)
 			move->viewangles[i] = MSG_ReadAngle16i();
@@ -643,7 +489,9 @@ void SV_ReadClientMove (void)
 	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 
 	// read buttons
-	if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
+	// be sure to bitwise OR them into the move->buttons because we want to
+	// accumulate button presses from multiple packets per actual move
+	if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3 || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
 		move->buttons = MSG_ReadByte ();
 	else
 		move->buttons = MSG_ReadLong ();
@@ -654,7 +502,7 @@ void SV_ReadClientMove (void)
 	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 
 	// PRYDON_CLIENTCURSOR
-	if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5)
+	if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3 && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5)
 	{
 		// 30 bytes
 		move->cursor_screen[0] = MSG_ReadShort() * (1.0f / 32767.0f);
@@ -678,66 +526,169 @@ void SV_ReadClientMove (void)
 		if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 	}
 
-	if (!host_client->spawned)
-		memset(move, 0, sizeof(*move));
-	else
+	// if the previous move has not been applied yet, we need to accumulate
+	// the impulse/buttons from it
+	if (!host_client->cmd.applied)
 	{
-		// apply the latest accepted move to the entity fields
-		SV_ApplyClientMove();
-		host_client->movesequence = move->sequence;
-		if (host_client->movesequence)
-		{
-			double frametime = move->time - oldmovetime;
-			double oldframetime = prog->globals.server->frametime;
-			if (frametime > 0.1)
-				frametime = 0.1;
-			prog->globals.server->frametime = frametime;
-			SV_Physics_Entity(host_client->edict, true);
-			prog->globals.server->frametime = oldframetime;
-		}
+		if (!move->impulse)
+			move->impulse = host_client->cmd.impulse;
+		move->buttons |= host_client->cmd.buttons;
 	}
+
+	// now store this move for later execution
+	// (we have to buffer the moves because of old ones being repeated)
+	if (sv_numreadmoves < CL_MAX_USERCMDS)
+		sv_readmoves[sv_numreadmoves++] = *move;
 }
 
-void SV_ApplyClientMove (void)
+void SV_ExecuteClientMoves(void)
 {
+	int moveindex;
+	float moveframetime;
+	double oldframetime;
+	double oldframetime2;
 #ifdef NUM_PING_TIMES
-	int i;
-	float total;
+	double total;
 #endif
 	prvm_eval_t *val;
-	usercmd_t *move = &host_client->cmd;
+	if (sv_numreadmoves < 1)
+		return;
+	// only start accepting input once the player is spawned
+	if (!host_client->spawned)
+		return;
+#if DEBUGMOVES
+	Con_Printf("SV_ExecuteClientMoves: read %i moves at sv.time %f\n", sv_numreadmoves, (float)sv.time);
+#endif
+	// disable clientside movement prediction in some cases
+	if (ceil(max(sv_readmoves[sv_numreadmoves-1].receivetime - sv_readmoves[sv_numreadmoves-1].time, 0) * 1000.0) < sv_clmovement_minping.integer)
+		host_client->clmovement_disabletimeout = realtime + sv_clmovement_minping_disabletime.value / 1000.0;
+	// several conditions govern whether clientside movement prediction is allowed
+	if (sv_readmoves[sv_numreadmoves-1].sequence && sv_clmovement_enable.integer && sv_clmovement_waitforinput.integer > 0 && host_client->clmovement_disabletimeout <= realtime && host_client->edict->fields.server->movetype == MOVETYPE_WALK && (!(val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.disableclientprediction)) || !val->_float))
+	{
+		// process the moves in order and ignore old ones
+		// but always trust the latest move
+		// (this deals with bogus initial move sequences after level change,
+		//  where the client will eventually catch up with the level change
+		//  and reset its move sequence)
+		for (moveindex = 0;moveindex < sv_numreadmoves;moveindex++)
+		{
+			usercmd_t *move = sv_readmoves + moveindex;
+			if (host_client->movesequence < move->sequence || moveindex == sv_numreadmoves - 1)
+			{
+#if DEBUGMOVES
+				Con_Printf("%smove #%i %ims (%ims) %i %i '%i %i %i' '%i %i %i'\n", (move->time - host_client->cmd.time) > sv.frametime * 1.01 ? "^1" : "^2", move->sequence, (int)floor((move->time - host_client->cmd.time) * 1000.0 + 0.5), (int)floor(move->time * 1000.0 + 0.5), move->impulse, move->buttons, (int)move->viewangles[0], (int)move->viewangles[1], (int)move->viewangles[2], (int)move->forwardmove, (int)move->sidemove, (int)move->upmove);
+#endif
+				// this is a new move
+				moveframetime = bound(0, move->time - host_client->cmd.time, 0.1);
+				//Con_Printf("movesequence = %i (%i lost), moveframetime = %f\n", move->sequence, move->sequence ? move->sequence - host_client->movesequence - 1 : 0, moveframetime);
+				host_client->cmd = *move;
+				host_client->movesequence = move->sequence;
+
+				// if using prediction, we need to perform moves when packets are
+				// received, even if multiple occur in one frame
+				// (they can't go beyond the current time so there is no cheat issue
+				//  with this approach, and if they don't send input for a while they
+				//  start moving anyway, so the longest 'lagaport' possible is
+				//  determined by the sv_clmovement_waitforinput cvar)
+				if (moveframetime <= 0)
+					continue;
+				oldframetime = prog->globals.server->frametime;
+				oldframetime2 = sv.frametime;
+				// update ping time for qc to see while executing this move
+				host_client->ping = host_client->cmd.receivetime - host_client->cmd.time;
+				// the server and qc frametime values must be changed temporarily
+				prog->globals.server->frametime = sv.frametime = moveframetime;
+				// if move is more than 50ms, split it into two moves (this matches QWSV behavior and the client prediction)
+				if (sv.frametime > 0.05)
+				{
+					prog->globals.server->frametime = sv.frametime = moveframetime * 0.5f;
+					SV_Physics_ClientMove();
+				}
+				SV_Physics_ClientMove();
+				sv.frametime = oldframetime2;
+				prog->globals.server->frametime = oldframetime;
+				host_client->clmovement_skipphysicsframes = sv_clmovement_waitforinput.integer;
+			}
+		}
+	}
+	else
+	{
+		// try to gather button bits from old moves, but only if their time is
+		// advancing (ones with the same timestamp can't be trusted)
+		for (moveindex = 0;moveindex < sv_numreadmoves-1;moveindex++)
+		{
+			usercmd_t *move = sv_readmoves + moveindex;
+			if (host_client->cmd.time < move->time)
+			{
+				sv_readmoves[sv_numreadmoves-1].buttons |= move->buttons;
+				if (move->impulse)
+					sv_readmoves[sv_numreadmoves-1].impulse = move->impulse;
+			}
+		}
+		// now copy the new move
+		host_client->cmd = sv_readmoves[sv_numreadmoves-1];
+		host_client->movesequence = 0;
+		// make sure that normal physics takes over immediately
+		host_client->clmovement_skipphysicsframes = 0;
+	}
 
 	// calculate average ping time
-	host_client->ping = move->receivetime - move->time;
+	host_client->ping = host_client->cmd.receivetime - host_client->cmd.time;
 #ifdef NUM_PING_TIMES
-	host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = move->receivetime - move->time;
+	host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = host_client->cmd.receivetime - host_client->cmd.time;
 	host_client->num_pings++;
 	for (i=0, total = 0;i < NUM_PING_TIMES;i++)
 		total += host_client->ping_times[i];
 	host_client->ping = total / NUM_PING_TIMES;
 #endif
+}
+
+void SV_ApplyClientMove (void)
+{
+	prvm_eval_t *val;
+	usercmd_t *move = &host_client->cmd;
+
+	if (!move->receivetime)
+		return;
+
+	// note: a move can be applied multiple times if the client packets are
+	// not coming as often as the physics is executed, and the move must be
+	// applied before running qc each time because the id1 qc had a bug where
+	// it clears self.button2 in PlayerJump, causing pogostick behavior if
+	// moves are not applied every time before calling qc
+	move->applied = true;
 
 	// set the edict fields
 	host_client->edict->fields.server->button0 = move->buttons & 1;
 	host_client->edict->fields.server->button2 = (move->buttons & 2)>>1;
 	if (move->impulse)
 		host_client->edict->fields.server->impulse = move->impulse;
+	// only send the impulse to qc once
+	move->impulse = 0;
 	VectorCopy(move->viewangles, host_client->edict->fields.server->v_angle);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button3))) val->_float = ((move->buttons >> 2) & 1);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button4))) val->_float = ((move->buttons >> 3) & 1);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button5))) val->_float = ((move->buttons >> 4) & 1);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button6))) val->_float = ((move->buttons >> 5) & 1);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button7))) val->_float = ((move->buttons >> 6) & 1);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button8))) val->_float = ((move->buttons >> 7) & 1);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_buttonuse))) val->_float = ((move->buttons >> 8) & 1);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_buttonchat))) val->_float = ((move->buttons >> 9) & 1);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_cursor_active))) val->_float = ((move->buttons >> 10) & 1);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_movement))) VectorSet(val->vector, move->forwardmove, move->sidemove, move->upmove);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_cursor_screen))) VectorCopy(move->cursor_screen, val->vector);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_start))) VectorCopy(move->cursor_start, val->vector);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_endpos))) VectorCopy(move->cursor_impact, val->vector);
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_ent))) val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM(move->cursor_entitynumber));
-	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ping))) val->_float = host_client->ping * 1000.0;
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button3))) val->_float = ((move->buttons >> 2) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button4))) val->_float = ((move->buttons >> 3) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button5))) val->_float = ((move->buttons >> 4) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button6))) val->_float = ((move->buttons >> 5) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button7))) val->_float = ((move->buttons >> 6) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button8))) val->_float = ((move->buttons >> 7) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button9))) val->_float = ((move->buttons >> 11) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button10))) val->_float = ((move->buttons >> 12) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button11))) val->_float = ((move->buttons >> 13) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button12))) val->_float = ((move->buttons >> 14) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button13))) val->_float = ((move->buttons >> 15) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button14))) val->_float = ((move->buttons >> 16) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button15))) val->_float = ((move->buttons >> 17) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.button16))) val->_float = ((move->buttons >> 18) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.buttonuse))) val->_float = ((move->buttons >> 8) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.buttonchat))) val->_float = ((move->buttons >> 9) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_active))) val->_float = ((move->buttons >> 10) & 1);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.movement))) VectorSet(val->vector, move->forwardmove, move->sidemove, move->upmove);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_screen))) VectorCopy(move->cursor_screen, val->vector);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_trace_start))) VectorCopy(move->cursor_start, val->vector);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_trace_endpos))) VectorCopy(move->cursor_impact, val->vector);
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_trace_ent))) val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM(move->cursor_entitynumber));
+	if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ping))) val->_float = host_client->ping * 1000.0;
 }
 
 void SV_FrameLost(int framenum)
@@ -762,12 +713,14 @@ SV_ReadClientMessage
 ===================
 */
 extern void SV_SendServerinfo(client_t *client);
+extern sizebuf_t vm_tempstringsbuf;
 void SV_ReadClientMessage(void)
 {
-	int cmd, num;
-	char *s;
+	int cmd, num, start;
+	char *s, *p, *q;
 
 	//MSG_BeginReading ();
+	sv_numreadmoves = 0;
 
 	for(;;)
 	{
@@ -785,10 +738,12 @@ void SV_ReadClientMessage(void)
 			return;
 		}
 
-		cmd = MSG_ReadChar ();
+		cmd = MSG_ReadByte ();
 		if (cmd == -1)
 		{
 			// end of message
+			// apply the moves that were read this frame
+			SV_ExecuteClientMoves();
 			break;
 		}
 
@@ -803,37 +758,46 @@ void SV_ReadClientMessage(void)
 			break;
 
 		case clc_stringcmd:
+			// allow reliable messages now as the client is done with initial loading
+			if (host_client->sendsignon == 2)
+				host_client->sendsignon = 0;
 			s = MSG_ReadString ();
+			q = NULL;
+			for(p = s; *p; ++p) switch(*p)
+			{
+				case 10:
+				case 13:
+					if(!q)
+						q = p;
+					break;
+				default:
+					if(q)
+						goto clc_stringcmd_invalid; // newline seen, THEN something else -> possible exploit
+					break;
+			}
+			if(q)
+				*q = 0;
 			if (strncasecmp(s, "spawn", 5) == 0
 			 || strncasecmp(s, "begin", 5) == 0
 			 || strncasecmp(s, "prespawn", 8) == 0)
 				Cmd_ExecuteString (s, src_client);
-			else if (SV_ParseClientCommandQC)
+			else if (prog->funcoffsets.SV_ParseClientCommand)
 			{
-				PRVM_G_INT(OFS_PARM0) = PRVM_SetEngineString(s);
+				int restorevm_tempstringsbuf_cursize;
+				restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
+				PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(s);
 				prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
-				PRVM_ExecuteProgram ((func_t)(SV_ParseClientCommandQC - prog->functions), "QC function SV_ParseClientCommand is missing");
+				PRVM_ExecuteProgram (prog->funcoffsets.SV_ParseClientCommand, "QC function SV_ParseClientCommand is missing");
+				vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 			}
-			else if (strncasecmp(s, "status", 6) == 0
-			 || strncasecmp(s, "name", 4) == 0
-			 || strncasecmp(s, "say", 3) == 0
-			 || strncasecmp(s, "say_team", 8) == 0
-			 || strncasecmp(s, "tell", 4) == 0
-			 || strncasecmp(s, "color", 5) == 0
-			 || strncasecmp(s, "kill", 4) == 0
-			 || strncasecmp(s, "pause", 5) == 0
-			 || strncasecmp(s, "kick", 4) == 0
-			 || strncasecmp(s, "ping", 4) == 0
-			 || strncasecmp(s, "ban", 3) == 0
-			 || strncasecmp(s, "pmodel", 6) == 0
-			 || strncasecmp(s, "rate", 4) == 0
-			 || strncasecmp(s, "playermodel", 11) == 0
-			 || strncasecmp(s, "playerskin", 10) == 0
-			 || (gamemode == GAME_NEHAHRA && (strncasecmp(s, "max", 3) == 0 || strncasecmp(s, "monster", 7) == 0 || strncasecmp(s, "scrag", 5) == 0 || strncasecmp(s, "gimme", 5) == 0 || strncasecmp(s, "wraith", 6) == 0))
-			 || (gamemode != GAME_NEHAHRA && (strncasecmp(s, "god", 3) == 0 || strncasecmp(s, "notarget", 8) == 0 || strncasecmp(s, "fly", 3) == 0 || strncasecmp(s, "give", 4) == 0 || strncasecmp(s, "noclip", 6) == 0)))
-				Cmd_ExecuteString (s, src_client);
 			else
-				Con_Printf("%s tried to %s\n", host_client->name, s);
+				Cmd_ExecuteString (s, src_client);
+			break;
+
+clc_stringcmd_invalid:
+			Con_Printf("Received invalid stringcmd from %s\n", host_client->name);
+			if(developer.integer)
+				Com_HexDumpToConsole((unsigned char *) s, strlen(s));
 			break;
 
 		case clc_disconnect:
@@ -841,16 +805,71 @@ void SV_ReadClientMessage(void)
 			return;
 
 		case clc_move:
-			SV_ReadClientMove ();
+			SV_ReadClientMove();
+			break;
+
+		case clc_ackdownloaddata:
+			start = MSG_ReadLong();
+			num = MSG_ReadShort();
+			if (host_client->download_file && host_client->download_started)
+			{
+				if (host_client->download_expectedposition == start)
+				{
+					int size = (int)FS_FileSize(host_client->download_file);
+					// a data block was successfully received by the client,
+					// update the expected position on the next data block
+					host_client->download_expectedposition = start + num;
+					// if this was the last data block of the file, it's done
+					if (host_client->download_expectedposition >= FS_FileSize(host_client->download_file))
+					{
+						// tell the client that the download finished
+						// we need to calculate the crc now
+						//
+						// note: at this point the OS probably has the file
+						// entirely in memory, so this is a faster operation
+						// now than it was when the download started.
+						//
+						// it is also preferable to do this at the end of the
+						// download rather than the start because it reduces
+						// potential for Denial Of Service attacks against the
+						// server.
+						int crc;
+						unsigned char *temp;
+						FS_Seek(host_client->download_file, 0, SEEK_SET);
+						temp = Mem_Alloc(tempmempool, size);
+						FS_Read(host_client->download_file, temp, size);
+						crc = CRC_Block(temp, size);
+						Mem_Free(temp);
+						// calculated crc, send the file info to the client
+						// (so that it can verify the data)
+						Host_ClientCommands(va("\ncl_downloadfinished %i %i %s\n", size, crc, host_client->download_name));
+						Con_DPrintf("Download of %s by %s has finished\n", host_client->download_name, host_client->name);
+						FS_Close(host_client->download_file);
+						host_client->download_file = NULL;
+						host_client->download_name[0] = 0;
+						host_client->download_expectedposition = 0;
+						host_client->download_started = false;
+					}
+				}
+				else
+				{
+					// a data block was lost, reset to the expected position
+					// and resume sending from there
+					FS_Seek(host_client->download_file, host_client->download_expectedposition, SEEK_SET);
+				}
+			}
 			break;
 
 		case clc_ackframe:
 			if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 			num = MSG_ReadLong();
 			if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
-			if (developer_networkentities.integer >= 1)
+			if (developer_networkentities.integer >= 10)
 				Con_Printf("recv clc_ackframe %i\n", num);
-			if (host_client->latestframenum < num)
+			// if the client hasn't progressed through signons yet,
+			// ignore any clc_ackframes we get (they're probably from the
+			// previous level)
+			if (host_client->spawned && host_client->latestframenum < num)
 			{
 				int i;
 				for (i = host_client->latestframenum + 1;i < num;i++)