X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_user.c;h=1cb5a3f057c305be869a94fdd163658e2098427b;hp=deaea53ffd4ab16540ef276694b8bd3e001bc1ff;hb=54c8d13c76444ca7e9d3f65229b5638cc67c3db5;hpb=e6d2ecddf7defdf779ada589f08950cd6c7006f9

diff --git a/sv_user.c b/sv_user.c
index deaea53f..1cb5a3f0 100644
--- a/sv_user.c
+++ b/sv_user.c
@@ -20,30 +20,215 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // sv_user.c -- server code for moving users
 
 #include "quakedef.h"
+#include "sv_demo.h"
+#define DEBUGMOVES 0
 
-edict_t	*sv_player;
+static usercmd_t usercmd;
+extern cvar_t sv_autodemo_perclient;
+extern cvar_t sv_rollangle;
+extern cvar_t sv_rollspeed;
 
-cvar_t	sv_edgefriction = {0, "edgefriction", "2"};
-cvar_t	sv_predict = {0, "sv_predict", "1"};
-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"};
+/*
+==================
+SV_PreSpawn_f
+==================
+*/
+void SV_PreSpawn_f(cmd_state_t *cmd)
+{
+	if (host_client->prespawned)
+	{
+		Con_Print("prespawn not valid -- already prespawned\n");
+		return;
+	}
+	host_client->prespawned = true;
+
+	if (host_client->netconnection)
+	{
+		SZ_Write (&host_client->netconnection->message, sv.signon.data, sv.signon.cursize);
+		MSG_WriteByte (&host_client->netconnection->message, svc_signonnum);
+		MSG_WriteByte (&host_client->netconnection->message, 2);
+		host_client->sendsignon = 0;		// enable unlimited sends again
+	}
+
+	// reset the name change timer because the client will send name soon
+	host_client->nametime = 0;
+}
+
+/*
+==================
+SV_Spawn_f
+==================
+*/
+void SV_Spawn_f(cmd_state_t *cmd)
+{
+	prvm_prog_t *prog = SVVM_prog;
+	int i;
+	client_t *client;
+	int stats[MAX_CL_STATS];
+
+	if (!host_client->prespawned)
+	{
+		Con_Print("Spawn not valid -- not yet prespawned\n");
+		return;
+	}
+	if (host_client->spawned)
+	{
+		Con_Print("Spawn not valid -- already spawned\n");
+		return;
+	}
+	host_client->spawned = true;
+
+	// reset name change timer again because they might want to change name
+	// again in the first 5 seconds after connecting
+	host_client->nametime = 0;
+
+	// LadyHavoc: moved this above the QC calls at FrikaC's request
+	// LadyHavoc: commented this out
+	//if (host_client->netconnection)
+	//	SZ_Clear (&host_client->netconnection->message);
+
+	// run the entrance script
+	if (sv.loadgame)
+	{
+		// loaded games are fully initialized already
+		if (PRVM_serverfunction(RestoreGame))
+		{
+			Con_DPrint("Calling RestoreGame\n");
+			PRVM_serverglobalfloat(time) = sv.time;
+			PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(host_client->edict);
+			prog->ExecuteProgram(prog, PRVM_serverfunction(RestoreGame), "QC function RestoreGame is missing");
+		}
+	}
+	else
+	{
+		//Con_Printf("SV_Spawn_f: host_client->edict->netname = %s, host_client->edict->netname = %s, host_client->name = %s\n", PRVM_GetString(PRVM_serveredictstring(host_client->edict, netname)), PRVM_GetString(PRVM_serveredictstring(host_client->edict, netname)), host_client->name);
 
-static	vec3_t		forward, right, up;
+		// copy spawn parms out of the client_t
+		for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
+			(&PRVM_serverglobalfloat(parm1))[i] = host_client->spawn_parms[i];
 
-vec3_t	wishdir;
-float	wishspeed;
+		// call the spawn function
+		host_client->clientconnectcalled = true;
+		PRVM_serverglobalfloat(time) = sv.time;
+		PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(host_client->edict);
+		prog->ExecuteProgram(prog, PRVM_serverfunction(ClientConnect), "QC function ClientConnect is missing");
 
-// world
-float	*angles;
-float	*origin;
-float	*velocity;
+		Con_Printf("%s connected\n", host_client->name);
 
-qboolean	onground;
+		PRVM_serverglobalfloat(time) = sv.time;
+		prog->ExecuteProgram(prog, PRVM_serverfunction(PutClientInServer), "QC function PutClientInServer is missing");
+	}
 
-usercmd_t	cmd;
+	if (!host_client->netconnection)
+		return;
 
+	// send time of update
+	MSG_WriteByte (&host_client->netconnection->message, svc_time);
+	MSG_WriteFloat (&host_client->netconnection->message, sv.time);
+
+	// send all current names, colors, and frag counts
+	for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
+	{
+		if (!client->active)
+			continue;
+		MSG_WriteByte (&host_client->netconnection->message, svc_updatename);
+		MSG_WriteByte (&host_client->netconnection->message, i);
+		MSG_WriteString (&host_client->netconnection->message, client->name);
+		MSG_WriteByte (&host_client->netconnection->message, svc_updatefrags);
+		MSG_WriteByte (&host_client->netconnection->message, i);
+		MSG_WriteShort (&host_client->netconnection->message, client->frags);
+		MSG_WriteByte (&host_client->netconnection->message, svc_updatecolors);
+		MSG_WriteByte (&host_client->netconnection->message, i);
+		MSG_WriteByte (&host_client->netconnection->message, client->colors);
+	}
+
+	// send all current light styles
+	for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
+	{
+		if (sv.lightstyles[i][0])
+		{
+			MSG_WriteByte (&host_client->netconnection->message, svc_lightstyle);
+			MSG_WriteByte (&host_client->netconnection->message, (char)i);
+			MSG_WriteString (&host_client->netconnection->message, sv.lightstyles[i]);
+		}
+	}
+
+	// send some stats
+	MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
+	MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALSECRETS);
+	MSG_WriteLong (&host_client->netconnection->message, (int)PRVM_serverglobalfloat(total_secrets));
+
+	MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
+	MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALMONSTERS);
+	MSG_WriteLong (&host_client->netconnection->message, (int)PRVM_serverglobalfloat(total_monsters));
+
+	MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
+	MSG_WriteByte (&host_client->netconnection->message, STAT_SECRETS);
+	MSG_WriteLong (&host_client->netconnection->message, (int)PRVM_serverglobalfloat(found_secrets));
+
+	MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
+	MSG_WriteByte (&host_client->netconnection->message, STAT_MONSTERS);
+	MSG_WriteLong (&host_client->netconnection->message, (int)PRVM_serverglobalfloat(killed_monsters));
+
+	// send a fixangle
+	// Never send a roll angle, because savegames can catch the server
+	// in a state where it is expecting the client to correct the angle
+	// and it won't happen if the game was just loaded, so you wind up
+	// with a permanent head tilt
+	if (sv.loadgame)
+	{
+		MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
+		MSG_WriteAngle (&host_client->netconnection->message, PRVM_serveredictvector(host_client->edict, v_angle)[0], sv.protocol);
+		MSG_WriteAngle (&host_client->netconnection->message, PRVM_serveredictvector(host_client->edict, v_angle)[1], sv.protocol);
+		MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+	}
+	else
+	{
+		MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
+		MSG_WriteAngle (&host_client->netconnection->message, PRVM_serveredictvector(host_client->edict, angles)[0], sv.protocol);
+		MSG_WriteAngle (&host_client->netconnection->message, PRVM_serveredictvector(host_client->edict, angles)[1], sv.protocol);
+		MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+	}
+
+	SV_WriteClientdataToMessage (host_client, host_client->edict, &host_client->netconnection->message, stats);
+
+	MSG_WriteByte (&host_client->netconnection->message, svc_signonnum);
+	MSG_WriteByte (&host_client->netconnection->message, 3);
+}
+
+/*
+==================
+SV_Begin_f
+==================
+*/
+void SV_Begin_f(cmd_state_t *cmd)
+{
+	if (!host_client->spawned)
+	{
+		Con_Print("Begin not valid -- not yet spawned\n");
+		return;
+	}
+	if (host_client->begun)
+	{
+		Con_Print("Begin not valid -- already begun\n");
+		return;
+	}
+	host_client->begun = true;
+
+	// LadyHavoc: note: this code also exists in SV_DropClient
+	if (sv.loadgame)
+	{
+		int i;
+		for (i = 0;i < svs.maxclients;i++)
+			if (svs.clients[i].active && !svs.clients[i].spawned)
+				break;
+		if (i == svs.maxclients)
+		{
+			Con_Printf("Loaded game, everyone rejoined - unpausing\n");
+			sv.paused = sv.loadgame = false; // we're basically done with loading now
+		}
+	}
+}
 
 /*
 ===============
@@ -53,40 +238,43 @@ SV_SetIdealPitch
 #define	MAX_FORWARD	6
 void SV_SetIdealPitch (void)
 {
-	float	angleval, sinval, cosval;
+	prvm_prog_t *prog = SVVM_prog;
+	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)sv_player->v.flags & FL_ONGROUND))
+	if (!((int)PRVM_serveredictfloat(host_client->edict, flags) & FL_ONGROUND))
 		return;
-		
-	angleval = sv_player->v.angles[YAW] * M_PI*2 / 360;
+
+	angleval = PRVM_serveredictvector(host_client->edict, angles)[YAW] * M_PI*2 / 360;
 	sinval = sin(angleval);
 	cosval = cos(angleval);
 
 	for (i=0 ; i<MAX_FORWARD ; i++)
 	{
-		top[0] = sv_player->v.origin[0] + cosval*(i+3)*12;
-		top[1] = sv_player->v.origin[1] + sinval*(i+3)*12;
-		top[2] = sv_player->v.origin[2] + sv_player->v.view_ofs[2];
-		
+		top[0] = PRVM_serveredictvector(host_client->edict, origin)[0] + cosval*(i+3)*12;
+		top[1] = PRVM_serveredictvector(host_client->edict, origin)[1] + sinval*(i+3)*12;
+		top[2] = PRVM_serveredictvector(host_client->edict, origin)[2] + PRVM_serveredictvector(host_client->edict, view_ofs)[2];
+
 		bottom[0] = top[0];
 		bottom[1] = top[1];
 		bottom[2] = top[2] - 160;
 
-		tr = SV_Move (top, vec3_origin, vec3_origin, bottom, MOVE_NOMONSTERS, sv_player);
-		if (tr.allsolid)
-			return;	// looking at a wall, leave ideal the way is was
+		tr = SV_TraceLine(top, bottom, MOVE_NOMONSTERS, host_client->edict, SUPERCONTENTS_SOLID, 0, 0, collision_extendmovelength.value);
+		// if looking at a wall, leave ideal the way is was
+		if (tr.startsolid)
+			return;
 
+		// near a dropoff
 		if (tr.fraction == 1)
-			return;	// near a dropoff
-		
+			return;
+
 		z[i] = top[2] + tr.fraction*(bottom[2]-top[2]);
 	}
-	
+
 	dir = 0;
 	steps = 0;
 	for (j=1 ; j<i ; j++)
@@ -95,24 +283,29 @@ void SV_SetIdealPitch (void)
 		if (step > -ON_EPSILON && step < ON_EPSILON)
 			continue;
 
+		// mixed changes
 		if (dir && ( step-dir > ON_EPSILON || step-dir < -ON_EPSILON ) )
-			return;		// mixed changes
+			return;
 
-		steps++;	
+		steps++;
 		dir = step;
 	}
-	
+
 	if (!dir)
 	{
-		sv_player->v.idealpitch = 0;
+		PRVM_serveredictfloat(host_client->edict, idealpitch) = 0;
 		return;
 	}
-	
+
 	if (steps < 2)
 		return;
-	sv_player->v.idealpitch = -dir * sv_idealpitchscale.value;
+	PRVM_serveredictfloat(host_client->edict, idealpitch) = -dir * sv_idealpitchscale.value;
 }
 
+static vec3_t wishdir, forward, right, up;
+static float wishspeed;
+
+static qbool onground;
 
 /*
 ==================
@@ -120,45 +313,40 @@ SV_UserFriction
 
 ==================
 */
-void SV_UserFriction (void)
+static void SV_UserFriction (void)
 {
-	float	*vel;
-	float	speed, newspeed, control;
-	vec3_t	start, stop;
-	float	friction;
-	trace_t	trace;
-	
-	vel = velocity;
-	
-	speed = sqrt(vel[0]*vel[0] +vel[1]*vel[1]);
+	prvm_prog_t *prog = SVVM_prog;
+	float speed, newspeed, control, friction;
+	vec3_t start, stop;
+	trace_t trace;
+
+	speed = sqrt(PRVM_serveredictvector(host_client->edict, velocity)[0]*PRVM_serveredictvector(host_client->edict, velocity)[0]+PRVM_serveredictvector(host_client->edict, velocity)[1]*PRVM_serveredictvector(host_client->edict, velocity)[1]);
 	if (!speed)
 		return;
 
-// if the leading edge is over a dropoff, increase friction
-	start[0] = stop[0] = origin[0] + vel[0]/speed*16;
-	start[1] = stop[1] = origin[1] + vel[1]/speed*16;
-	start[2] = origin[2] + sv_player->v.mins[2];
+	// if the leading edge is over a dropoff, increase friction
+	start[0] = stop[0] = PRVM_serveredictvector(host_client->edict, origin)[0] + PRVM_serveredictvector(host_client->edict, velocity)[0]/speed*16;
+	start[1] = stop[1] = PRVM_serveredictvector(host_client->edict, origin)[1] + PRVM_serveredictvector(host_client->edict, velocity)[1]/speed*16;
+	start[2] = PRVM_serveredictvector(host_client->edict, origin)[2] + PRVM_serveredictvector(host_client->edict, mins)[2];
 	stop[2] = start[2] - 34;
 
-	trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, sv_player);
+	trace = SV_TraceLine(start, stop, MOVE_NOMONSTERS, host_client->edict, SV_GenericHitSuperContentsMask(host_client->edict), 0, 0, collision_extendmovelength.value);
 
 	if (trace.fraction == 1.0)
 		friction = sv_friction.value*sv_edgefriction.value;
 	else
 		friction = sv_friction.value;
 
-// apply friction	
+	// apply friction
 	control = speed < sv_stopspeed.value ? sv_stopspeed.value : speed;
 	newspeed = speed - sv.frametime*control*friction;
-	
+
 	if (newspeed < 0)
 		newspeed = 0;
 	else
 		newspeed /= speed;
 
-	vel[0] = vel[0] * newspeed;
-	vel[1] = vel[1] * newspeed;
-	vel[2] = vel[2] * newspeed;
+	VectorScale(PRVM_serveredictvector(host_client->edict, velocity), newspeed, PRVM_serveredictvector(host_client->edict, velocity));
 }
 
 /*
@@ -166,87 +354,76 @@ void SV_UserFriction (void)
 SV_Accelerate
 ==============
 */
-#if 0
-void SV_Accelerate (vec3_t wishvel)
+static void SV_Accelerate (void)
 {
-	int			i;
-	float		addspeed, accelspeed;
-	vec3_t		pushvec;
+	prvm_prog_t *prog = SVVM_prog;
+	int i;
+	float addspeed, accelspeed, currentspeed;
 
-	if (wishspeed == 0)
-		return;
-
-	VectorSubtract (wishvel, velocity, pushvec);
-	addspeed = VectorNormalize (pushvec);
-
-	accelspeed = sv_accelerate.value*sv.frametime*addspeed;
-	if (accelspeed > addspeed)
-		accelspeed = addspeed;
-	
-	for (i=0 ; i<3 ; i++)
-		velocity[i] += accelspeed*pushvec[i];	
-}
-#endif
-void SV_Accelerate (void)
-{
-	int			i;
-	float		addspeed, accelspeed, currentspeed;
-
-	currentspeed = DotProduct (velocity, wishdir);
+	currentspeed = DotProduct (PRVM_serveredictvector(host_client->edict, velocity), wishdir);
 	addspeed = wishspeed - currentspeed;
 	if (addspeed <= 0)
 		return;
 	accelspeed = sv_accelerate.value*sv.frametime*wishspeed;
 	if (accelspeed > addspeed)
 		accelspeed = addspeed;
-	
+
 	for (i=0 ; i<3 ; i++)
-		velocity[i] += accelspeed*wishdir[i];	
+		PRVM_serveredictvector(host_client->edict, velocity)[i] += accelspeed*wishdir[i];
 }
 
-void SV_AirAccelerate (vec3_t wishveloc)
+extern cvar_t sv_gameplayfix_q2airaccelerate;
+static void SV_AirAccelerate (vec3_t wishveloc)
 {
-	int			i;
-	float		addspeed, wishspd, accelspeed, currentspeed;
-		
+	prvm_prog_t *prog = SVVM_prog;
+	int i;
+	float addspeed, wishspd, accelspeed, currentspeed;
+
 	wishspd = VectorNormalizeLength (wishveloc);
-	if (wishspd > 30)
-		wishspd = 30;
-	currentspeed = DotProduct (velocity, wishveloc);
+	if (wishspd > sv_maxairspeed.value)
+		wishspd = sv_maxairspeed.value;
+	currentspeed = DotProduct (PRVM_serveredictvector(host_client->edict, velocity), wishveloc);
 	addspeed = wishspd - currentspeed;
 	if (addspeed <= 0)
 		return;
-//	accelspeed = sv_accelerate.value * sv.frametime;
-	accelspeed = sv_accelerate.value*wishspeed * sv.frametime;
+	accelspeed = (sv_airaccelerate.value < 0 ? sv_accelerate.value : sv_airaccelerate.value)*(sv_gameplayfix_q2airaccelerate.integer ? wishspd : wishspeed) * sv.frametime;
 	if (accelspeed > addspeed)
 		accelspeed = addspeed;
-	
+
 	for (i=0 ; i<3 ; i++)
-		velocity[i] += accelspeed*wishveloc[i];	
+		PRVM_serveredictvector(host_client->edict, velocity)[i] += accelspeed*wishveloc[i];
 }
 
 
-void DropPunchAngle (void)
+static void DropPunchAngle (void)
 {
-	float	len;
-	eval_t	*val;
-	
-	len = VectorNormalizeLength (sv_player->v.punchangle);
-
-	len -= 10*sv.frametime;
-	if (len < 0)
-		len = 0;
-	VectorScale (sv_player->v.punchangle, len, sv_player->v.punchangle);
-	
-	if ((val = GETEDICTFIELDVALUE(sv_player, eval_punchvector)))
-	{
-		len = VectorNormalizeLength (val->vector);
-		
+	prvm_prog_t *prog = SVVM_prog;
+	vec_t len;
+	vec3_t punchangle, punchvector;
+
+	VectorCopy(PRVM_serveredictvector(host_client->edict, punchangle), punchangle);
+	VectorCopy(PRVM_serveredictvector(host_client->edict, punchvector), punchvector);
+
+	len = VectorNormalizeLength(punchangle);
+	if (len > 0)
+	{
+		len -= 10*sv.frametime;
+		if (len < 0)
+			len = 0;
+		VectorScale(punchangle, len, punchangle);
+	}
+
+	len = VectorNormalizeLength(punchvector);
+	if (len > 0)
+	{
 		len -= 20*sv.frametime;
 		if (len < 0)
 			len = 0;
-		VectorScale (val->vector, len, val->vector);
+		VectorScale(punchvector, len, punchvector);
 	}
+
+	VectorCopy(punchangle, PRVM_serveredictvector(host_client->edict, punchangle));
+	VectorCopy(punchvector, PRVM_serveredictvector(host_client->edict, punchvector));
 }
 
 /*
@@ -255,78 +432,74 @@ SV_WaterMove
 
 ===================
 */
-void SV_WaterMove (void)
+static void SV_WaterMove (void)
 {
-	int		i;
-	vec3_t	wishvel;
-	float	speed, newspeed, wishspeed, addspeed, accelspeed, temp;
+	prvm_prog_t *prog = SVVM_prog;
+	int i;
+	vec3_t wishvel, v_angle;
+	vec_t speed, newspeed, fwishspeed, addspeed, accelspeed, temp;
 
-//
-// user intentions
-//
-	AngleVectors (sv_player->v.v_angle, forward, right, up);
+	// user intentions
+	VectorCopy(PRVM_serveredictvector(host_client->edict, v_angle), v_angle);
+	AngleVectors(v_angle, forward, right, up);
 
 	for (i=0 ; i<3 ; i++)
-		wishvel[i] = forward[i]*cmd.forwardmove + right[i]*cmd.sidemove;
+		wishvel[i] = forward[i]*usercmd.forwardmove + right[i]*usercmd.sidemove;
 
-	if (!cmd.forwardmove && !cmd.sidemove && !cmd.upmove)
+	if (!usercmd.forwardmove && !usercmd.sidemove && !usercmd.upmove)
 		wishvel[2] -= 60;		// drift towards bottom
 	else
-		wishvel[2] += cmd.upmove;
+		wishvel[2] += usercmd.upmove;
 
-	wishspeed = Length(wishvel);
-	if (wishspeed > sv_maxspeed.value)
+	fwishspeed = VectorLength(wishvel);
+	if (fwishspeed > sv_maxspeed.value)
 	{
-		temp = sv_maxspeed.value/wishspeed;
+		temp = sv_maxspeed.value/fwishspeed;
 		VectorScale (wishvel, temp, wishvel);
-		wishspeed = sv_maxspeed.value;
+		fwishspeed = sv_maxspeed.value;
 	}
-	wishspeed *= 0.7;
+	fwishspeed *= 0.7;
 
-//
-// water friction
-//
-	speed = Length (velocity);
+	// water friction
+	speed = VectorLength(PRVM_serveredictvector(host_client->edict, 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;
-		VectorScale (velocity, temp, velocity);
+		VectorScale(PRVM_serveredictvector(host_client->edict, velocity), temp, PRVM_serveredictvector(host_client->edict, velocity));
 	}
 	else
 		newspeed = 0;
-	
-//
-// water acceleration
-//
-	if (!wishspeed)
+
+	// water acceleration
+	if (!fwishspeed)
 		return;
 
-	addspeed = wishspeed - newspeed;
+	addspeed = fwishspeed - newspeed;
 	if (addspeed <= 0)
 		return;
 
 	VectorNormalize (wishvel);
-	accelspeed = sv_accelerate.value * wishspeed * sv.frametime;
+	accelspeed = (sv_wateraccelerate.value < 0 ? sv_accelerate.value : sv_wateraccelerate.value) * fwishspeed * sv.frametime;
 	if (accelspeed > addspeed)
 		accelspeed = addspeed;
 
 	for (i=0 ; i<3 ; i++)
-		velocity[i] += accelspeed * wishvel[i];
+		PRVM_serveredictvector(host_client->edict, velocity)[i] += accelspeed * wishvel[i];
 }
 
-void SV_WaterJump (void)
+static void SV_WaterJump (void)
 {
-	if (sv.time > sv_player->v.teleport_time
-	|| !sv_player->v.waterlevel)
+	prvm_prog_t *prog = SVVM_prog;
+	if (sv.time > PRVM_serveredictfloat(host_client->edict, teleport_time) || !PRVM_serveredictfloat(host_client->edict, waterlevel))
 	{
-		sv_player->v.flags = (int)sv_player->v.flags & ~FL_WATERJUMP;
-		sv_player->v.teleport_time = 0;
+		PRVM_serveredictfloat(host_client->edict, flags) = (int)PRVM_serveredictfloat(host_client->edict, flags) & ~FL_WATERJUMP;
+		PRVM_serveredictfloat(host_client->edict, teleport_time) = 0;
 	}
-	sv_player->v.velocity[0] = sv_player->v.movedir[0];
-	sv_player->v.velocity[1] = sv_player->v.movedir[1];
+	PRVM_serveredictvector(host_client->edict, velocity)[0] = PRVM_serveredictvector(host_client->edict, movedir)[0];
+	PRVM_serveredictvector(host_client->edict, velocity)[1] = PRVM_serveredictvector(host_client->edict, movedir)[1];
 }
 
 
@@ -336,32 +509,30 @@ SV_AirMove
 
 ===================
 */
-void SV_AirMove (void)
+static void SV_AirMove (void)
 {
-	int			i;
-	vec3_t		wishvel;
-	float		fmove, smove, temp;
+	prvm_prog_t *prog = SVVM_prog;
+	int i;
+	vec3_t wishvel;
+	float fmove, smove, temp;
 
-	// LordHavoc: correct quake movement speed bug when looking up/down
+	// LadyHavoc: correct quake movement speed bug when looking up/down
 	wishvel[0] = wishvel[2] = 0;
-	wishvel[1] = sv_player->v.angles[1];
+	wishvel[1] = PRVM_serveredictvector(host_client->edict, angles)[1];
 	AngleVectors (wishvel, forward, right, up);
-//	AngleVectors (sv_player->v.angles, forward, right, up);
 
-	fmove = cmd.forwardmove;
-	smove = cmd.sidemove;
-	
+	fmove = usercmd.forwardmove;
+	smove = usercmd.sidemove;
+
 // hack to not let you back into teleporter
-	if (sv.time < sv_player->v.teleport_time && fmove < 0)
+	if (sv.time < PRVM_serveredictfloat(host_client->edict, teleport_time) && fmove < 0)
 		fmove = 0;
-		
+
 	for (i=0 ; i<3 ; i++)
 		wishvel[i] = forward[i]*fmove + right[i]*smove;
 
-	if ( (int)sv_player->v.movetype != MOVETYPE_WALK)
-		wishvel[2] = cmd.upmove;
-	else
-		wishvel[2] = 0;
+	if ((int)PRVM_serveredictfloat(host_client->edict, movetype) != MOVETYPE_WALK)
+		wishvel[2] += usercmd.upmove;
 
 	VectorCopy (wishvel, wishdir);
 	wishspeed = VectorNormalizeLength(wishdir);
@@ -371,296 +542,618 @@ void SV_AirMove (void)
 		VectorScale (wishvel, temp, wishvel);
 		wishspeed = sv_maxspeed.value;
 	}
-	
-	if ( sv_player->v.movetype == MOVETYPE_NOCLIP)
-	{	// noclip
-		VectorCopy (wishvel, velocity);
+
+	if (PRVM_serveredictfloat(host_client->edict, movetype) == MOVETYPE_NOCLIP)
+	{
+		// noclip
+		VectorCopy (wishvel, PRVM_serveredictvector(host_client->edict, velocity));
 	}
-	else if ( onground )
+	else if (onground)
 	{
 		SV_UserFriction ();
 		SV_Accelerate ();
 	}
 	else
-	{	// not on ground, so little effect on velocity
+	{
+		// not on ground, so little effect on velocity
 		SV_AirAccelerate (wishvel);
-	}		
+	}
 }
 
 /*
 ===================
-SV_ClientThink
+SV_PlayerPhysics
 
 the move fields specify an intended velocity in pix/sec
 the angle fields specify an exact angular motion in degrees
 ===================
 */
-void SV_ClientThink (void)
+void SV_PlayerPhysics (void)
 {
-	vec3_t		v_angle;
+	prvm_prog_t *prog = SVVM_prog;
+	vec3_t v_angle, angles, velocity;
+
+	//Con_Printf("clientthink for %ims\n", (int) (sv.frametime * 1000));
+
+	SV_ApplyClientMove();
+	// make sure the velocity is sane (not a NaN)
+	SV_CheckVelocity(host_client->edict);
+
+	// LadyHavoc: QuakeC replacement for SV_PlayerPhysics (player movement)
+	if (PRVM_serverfunction(SV_PlayerPhysics) && sv_playerphysicsqc.integer)
+	{
+		PRVM_serverglobalfloat(time) = sv.time;
+		PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(host_client->edict);
+		prog->ExecuteProgram(prog, PRVM_serverfunction(SV_PlayerPhysics), "QC function SV_PlayerPhysics is missing");
+		SV_CheckVelocity(host_client->edict);
+		return;
+	}
 
-	if (sv_player->v.movetype == MOVETYPE_NONE)
+	if (PRVM_serveredictfloat(host_client->edict, movetype) == MOVETYPE_NONE)
 		return;
-	
-	onground = (int)sv_player->v.flags & FL_ONGROUND;
 
-	origin = sv_player->v.origin;
-	velocity = sv_player->v.velocity;
+	onground = ((int)PRVM_serveredictfloat(host_client->edict, flags) & FL_ONGROUND) != 0;
 
 	DropPunchAngle ();
-	
-//
-// if dead, behave differently
-//
-	if (sv_player->v.health <= 0)
+
+	// if dead, behave differently
+	if (PRVM_serveredictfloat(host_client->edict, health) <= 0)
 		return;
 
-//
-// angles
-// show 1/3 the pitch angle and all the roll angle
-	cmd = host_client->cmd;
-	angles = sv_player->v.angles;
-	
-	VectorAdd (sv_player->v.v_angle, sv_player->v.punchangle, v_angle);
-	angles[ROLL] = V_CalcRoll (sv_player->v.angles, sv_player->v.velocity)*4;
-	if (!sv_player->v.fixangle)
-	{
-		// LordHavoc: pitch was ugly to begin with...  removed except in water
-		if (sv_player->v.waterlevel >= 2)
-			angles[PITCH] = -v_angle[PITCH]/3;
-		else
-			angles[PITCH] = 0;
-		angles[YAW] = v_angle[YAW];
+	usercmd = host_client->cmd;
+
+	// angles
+	// show 1/3 the pitch angle and all the roll angle
+	VectorAdd (PRVM_serveredictvector(host_client->edict, v_angle), PRVM_serveredictvector(host_client->edict, punchangle), v_angle);
+	VectorCopy(PRVM_serveredictvector(host_client->edict, angles), angles);
+	VectorCopy(PRVM_serveredictvector(host_client->edict, velocity), velocity);
+	PRVM_serveredictvector(host_client->edict, angles)[ROLL] = Com_CalcRoll (angles, velocity, sv_rollangle.value, sv_rollspeed.value)*4;
+	if (!PRVM_serveredictfloat(host_client->edict, fixangle))
+	{
+		PRVM_serveredictvector(host_client->edict, angles)[PITCH] = -v_angle[PITCH]/3;
+		PRVM_serveredictvector(host_client->edict, angles)[YAW] = v_angle[YAW];
 	}
 
-	if ( (int)sv_player->v.flags & FL_WATERJUMP )
+	if ( (int)PRVM_serveredictfloat(host_client->edict, flags) & FL_WATERJUMP )
 	{
 		SV_WaterJump ();
+		SV_CheckVelocity(host_client->edict);
 		return;
 	}
-//
-// walk
-//
-	if ( (sv_player->v.waterlevel >= 2)	&& (sv_player->v.movetype != MOVETYPE_NOCLIP) )
+
+	// walk
+	if ((PRVM_serveredictfloat(host_client->edict, waterlevel) >= 2) && (PRVM_serveredictfloat(host_client->edict, movetype) != MOVETYPE_NOCLIP))
 	{
 		SV_WaterMove ();
+		SV_CheckVelocity(host_client->edict);
 		return;
 	}
 
 	SV_AirMove ();
+	SV_CheckVelocity(host_client->edict);
 }
 
-
 /*
 ===================
 SV_ReadClientMove
 ===================
 */
-void SV_ReadClientMove (usercmd_t *move)
+int sv_numreadmoves = 0;
+usercmd_t sv_readmoves[CL_MAX_USERCMDS];
+static void SV_ReadClientMove (void)
 {
-	int		i;
-	vec3_t	angle;
-	int		bits;
-	eval_t	*val;
-	float	total;
-
-// read ping time
-	host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = sv.time - MSG_ReadFloat ();
-	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; // can be used for prediction
-	host_client->latency = 0;
-	if (sv_predict.integer && (svs.maxclients > 1) && (!sv.paused)) // if paused or a local game, don't predict
-		host_client->latency = host_client->ping;
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_ping)))
-		val->_float = host_client->ping * 1000.0;
-
-// read current angles
-	// dpprotocol version 2
-	for (i = 0;i < 3;i++)
-		angle[i] = MSG_ReadFloat ();
-
-	VectorCopy (angle, host_client->edict->v.v_angle);
-
-// read movement
-	move->forwardmove = MSG_ReadShort ();
-	move->sidemove = MSG_ReadShort ();
-	move->upmove = MSG_ReadShort ();
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_movement)))
-	{
-		val->vector[0] = move->forwardmove;
-		val->vector[1] = move->sidemove;
-		val->vector[2] = move->upmove;
-	}
-
-// read buttons
-	bits = MSG_ReadByte ();
-	host_client->edict->v.button0 = bits & 1;
-	host_client->edict->v.button2 = (bits & 2)>>1;
-	// LordHavoc: added 6 new buttons
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button3))) val->_float = ((bits >> 2) & 1);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button4))) val->_float = ((bits >> 3) & 1);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button5))) val->_float = ((bits >> 4) & 1);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button6))) val->_float = ((bits >> 5) & 1);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button7))) val->_float = ((bits >> 6) & 1);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button8))) val->_float = ((bits >> 7) & 1);
-
-	i = MSG_ReadByte ();
-	if (i)
-		host_client->edict->v.impulse = i;
-}
+	prvm_prog_t *prog = SVVM_prog;
+	int i;
+	usercmd_t newmove;
+	usercmd_t *move = &newmove;
 
-/*
-===================
-SV_ReadClientMessage
+	memset(move, 0, sizeof(*move));
 
-Returns false if the client should be killed
-===================
-*/
-void SV_SendServerinfo (client_t *client);
-qboolean SV_ReadClientMessage (void)
-{
-	int		ret;
-	int		cmd;
-	char		*s;
+	if (sv_message.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_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(&sv_message);
+	move->time = MSG_ReadFloat(&sv_message);
+	if (sv_message.badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+	move->receivetime = (float)sv.time;
+
+#if DEBUGMOVES
+	Con_Printf("%s move%i #%u %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, sv.time + sv.frametime);
+
+	// read current angles
+	for (i = 0;i < 3;i++)
+	{
+		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(&sv_message);
+		else if (sv.protocol == PROTOCOL_DARKPLACES1)
+			move->viewangles[i] = MSG_ReadAngle16i(&sv_message);
+		else if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3)
+			move->viewangles[i] = MSG_ReadAngle32f(&sv_message);
+		else
+			move->viewangles[i] = MSG_ReadAngle16i(&sv_message);
+	}
+	if (sv_message.badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+
+	// read movement
+	move->forwardmove = MSG_ReadCoord16i(&sv_message);
+	move->sidemove = MSG_ReadCoord16i(&sv_message);
+	move->upmove = MSG_ReadCoord16i(&sv_message);
+	if (sv_message.badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+
+	// read buttons
+	// 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(&sv_message);
+	else
+		move->buttons = MSG_ReadLong(&sv_message);
+	if (sv_message.badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+
+	// read impulse
+	move->impulse = MSG_ReadByte(&sv_message);
+	if (sv_message.badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 
-	do
+	// PRYDON_CLIENTCURSOR
+	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)
 	{
-nextmsg:
-		ret = NET_GetMessage (host_client->netconnection);
-		if (ret == -1)
+		// 30 bytes
+		move->cursor_screen[0] = MSG_ReadShort(&sv_message) * (1.0f / 32767.0f);
+		move->cursor_screen[1] = MSG_ReadShort(&sv_message) * (1.0f / 32767.0f);
+		move->cursor_start[0] = MSG_ReadFloat(&sv_message);
+		move->cursor_start[1] = MSG_ReadFloat(&sv_message);
+		move->cursor_start[2] = MSG_ReadFloat(&sv_message);
+		move->cursor_impact[0] = MSG_ReadFloat(&sv_message);
+		move->cursor_impact[1] = MSG_ReadFloat(&sv_message);
+		move->cursor_impact[2] = MSG_ReadFloat(&sv_message);
+		move->cursor_entitynumber = (unsigned short)MSG_ReadShort(&sv_message);
+		if (move->cursor_entitynumber >= prog->max_edicts)
 		{
-			Sys_Printf ("SV_ReadClientMessage: NET_GetMessage failed\n");
-			return false;
+			Con_DPrintf("SV_ReadClientMessage: client send bad cursor_entitynumber\n");
+			move->cursor_entitynumber = 0;
 		}
-		if (!ret)
-			return true;
+		// as requested by FrikaC, cursor_trace_ent is reset to world if the
+		// entity is free at time of receipt
+		if (PRVM_EDICT_NUM(move->cursor_entitynumber)->priv.server->free)
+			move->cursor_entitynumber = 0;
+		if (sv_message.badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+	}
 
-		MSG_BeginReading ();
+	// if the previous move has not been applied yet, we need to accumulate
+	// the impulse/buttons from it
+	if (!host_client->cmd.applied)
+	{
+		if (!move->impulse)
+			move->impulse = host_client->cmd.impulse;
+		move->buttons |= host_client->cmd.buttons;
+	}
 
-		while (1)
-		{
-			if (!host_client->active)
-				return false;	// a command caused an error
+	// 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;
 
-			if (msg_badread)
+	// movement packet loss tracking
+	// bones_was_here: checking begun prevents heavy loss detection right after a map change
+	if(move->sequence && host_client->begun)
+	{
+		if(move->sequence > host_client->movement_highestsequence_seen)
+		{
+			if(host_client->movement_highestsequence_seen)
 			{
-				Sys_Printf ("SV_ReadClientMessage: badread\n");
-				return false;
+				// mark moves in between as lost
+				unsigned int delta = move->sequence - host_client->movement_highestsequence_seen - 1;
+				if(delta < NETGRAPH_PACKETS)
+				{
+					unsigned int u;
+					for(u = 0; u < delta; ++u)
+						host_client->movement_count[(host_client->movement_highestsequence_seen + 1 + u) % NETGRAPH_PACKETS] = -1;
+				}
+				else
+					memset(host_client->movement_count, -1, sizeof(host_client->movement_count));
 			}
+			// mark THIS move as seen for the first time
+			host_client->movement_count[move->sequence % NETGRAPH_PACKETS] = 1;
+			// update highest sequence seen
+			host_client->movement_highestsequence_seen = move->sequence;
+		}
+		else
+			if(host_client->movement_count[move->sequence % NETGRAPH_PACKETS] >= 0)
+				++host_client->movement_count[move->sequence % NETGRAPH_PACKETS];
+	}
+	else
+	{
+		host_client->movement_highestsequence_seen = 0;
+		memset(host_client->movement_count, 0, sizeof(host_client->movement_count));
+	}
+}
 
-			cmd = MSG_ReadChar ();
+static void SV_ExecuteClientMoves(void)
+{
+	prvm_prog_t *prog = SVVM_prog;
+	int moveindex;
+	double moveframetime;
+	double oldframetime;
+	double oldframetime2;
 
-			switch (cmd)
+	if (sv_numreadmoves < 1)
+		return;
+	// only start accepting input once the player is spawned
+	if (!host_client->begun)
+		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 = host.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_inputtimeout.value > 0 && host_client->clmovement_disabletimeout <= host.realtime && (PRVM_serveredictfloat(host_client->edict, disableclientprediction) == -1 || (PRVM_serveredictfloat(host_client->edict, movetype) == MOVETYPE_WALK && (!PRVM_serveredictfloat(host_client->edict, disableclientprediction)))))
+	{
+		// 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)
 			{
-			case -1:
-				goto nextmsg;		// end of message
-
-			default:
-				Sys_Printf ("SV_ReadClientMessage: unknown command char %i\n", cmd);
-				return false;
-
-			case clc_nop:
-//				Sys_Printf ("clc_nop\n");
-				break;
+#if DEBUGMOVES
+				Con_Printf("%smove #%u %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
+				move->time = bound(sv.time - 1, move->time, sv.time); // prevent slowhack/speedhack combos
+				move->time = max(move->time, host_client->cmd.time); // prevent backstepping of time
+				// bones_was_here: limit moveframetime to a multiple of sv.frametime to match inputtimeout behaviour
+				moveframetime = min(move->time - host_client->cmd.time, min(0.1, sys_ticrate.value > 0.0 && sv.frametime > 0.0 ? sv.frametime * ceil(sv_clmovement_inputtimeout.value / sv.frametime) : sv_clmovement_inputtimeout.value));
+
+
+				// discard (treat like lost) moves with too low distance from
+				// the previous one to prevent hacks using float inaccuracy
+				// clients will see this as packet loss in the netgraph
+				// this should also apply if a move cannot get
+				// executed because it came too late and
+				// already was performed serverside
+				if(moveframetime < 0.0005)
+				{
+					// count the move as LOST if we don't
+					// execute it but it has higher
+					// sequence count
+					if(host_client->movesequence)
+						if(move->sequence > host_client->movesequence)
+							host_client->movement_count[(move->sequence) % NETGRAPH_PACKETS] = -1;
+					continue;
+				}
 
-			case clc_stringcmd:
-				s = MSG_ReadString ();
-				ret = 0;
-				if (Q_strncasecmp(s, "status", 6) == 0
-				 || Q_strncasecmp(s, "name", 4) == 0
-				 || Q_strncasecmp(s, "say", 3) == 0
-				 || Q_strncasecmp(s, "say_team", 8) == 0
-				 || Q_strncasecmp(s, "tell", 4) == 0
-				 || Q_strncasecmp(s, "color", 5) == 0
-				 || Q_strncasecmp(s, "kill", 4) == 0
-				 || Q_strncasecmp(s, "pause", 5) == 0
-				 || Q_strncasecmp(s, "spawn", 5) == 0
-				 || Q_strncasecmp(s, "begin", 5) == 0
-				 || Q_strncasecmp(s, "prespawn", 8) == 0
-				 || Q_strncasecmp(s, "kick", 4) == 0
-				 || Q_strncasecmp(s, "ping", 4) == 0
-				 || Q_strncasecmp(s, "ban", 3) == 0
-				 || Q_strncasecmp(s, "pmodel", 6) == 0
-				 || (gamemode == GAME_NEHAHRA && (Q_strncasecmp(s, "max", 3) == 0 || Q_strncasecmp(s, "monster", 7) == 0 || Q_strncasecmp(s, "scrag", 5) == 0 || Q_strncasecmp(s, "gimme", 5) == 0 || Q_strncasecmp(s, "wraith", 6) == 0))
-				 || (gamemode != GAME_NEHAHRA && (Q_strncasecmp(s, "god", 3) == 0 || Q_strncasecmp(s, "notarget", 8) == 0 || Q_strncasecmp(s, "fly", 3) == 0 || Q_strncasecmp(s, "give", 4) == 0 || Q_strncasecmp(s, "noclip", 6) == 0)))
+				//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_inputtimeout cvar)
+				oldframetime = PRVM_serverglobalfloat(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
+				PRVM_serverglobalfloat(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)
 				{
-					ret = 1;
-					Cmd_ExecuteString (s, src_client);
+					PRVM_serverglobalfloat(frametime) = sv.frametime = moveframetime * 0.5f;
+					SV_Physics_ClientMove();
 				}
-				else
-					Con_DPrintf("%s tried to %s\n", host_client->name, s);
-				/*
-				if (ret == 2)
-					Cbuf_InsertText (s);
-				else if (ret == 1)
-					Cmd_ExecuteString (s, src_client);
-				else
-					Con_DPrintf("%s tried to %s\n", host_client->name, s);
-				*/
-				break;
+				SV_Physics_ClientMove();
+				sv.frametime = oldframetime2;
+				PRVM_serverglobalfloat(frametime) = oldframetime;
+				host_client->clmovement_inputtimeout = min(0.1, sv_clmovement_inputtimeout.value);
+			}
+		}
+	}
+	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->cmd.time = max(host_client->cmd.time, sv.time);
+			// physics will run up to sv.time, so allow no predicted moves
+			// before that otherwise, there is a speedhack by turning
+			// prediction on and off repeatedly on client side because the
+			// engine would run BOTH client and server physics for the same
+			// time
+		host_client->movesequence = 0;
+		// make sure that normal physics takes over immediately
+		host_client->clmovement_inputtimeout = 0;
+		// update ping time
+		host_client->ping = host_client->cmd.receivetime - sv_readmoves[sv_numreadmoves-1].time;
+	}
+}
 
-			case clc_disconnect:
-//				Sys_Printf ("SV_ReadClientMessage: client disconnected\n");
-				return false;
+void SV_ApplyClientMove (void)
+{
+	prvm_prog_t *prog = SVVM_prog;
+	usercmd_t *move = &host_client->cmd;
+	int j, movementloss, packetloss;
 
-			case clc_move:
-				SV_ReadClientMove (&host_client->cmd);
-				break;
+	if (!move->receivetime)
+		return;
 
-			case clc_ackentities:
-				EntityFrame_AckFrame(&host_client->entitydatabase, MSG_ReadLong());
-				break;
-			}
-		}
-	} while (ret == 1);
+	// 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
+	PRVM_serveredictfloat(host_client->edict, button0) = move->buttons & 1;
+	PRVM_serveredictfloat(host_client->edict, button2) = (move->buttons & 2)>>1;
+	if (move->impulse)
+		PRVM_serveredictfloat(host_client->edict, impulse) = move->impulse;
+	// only send the impulse to qc once
+	move->impulse = 0;
+
+	movementloss = packetloss = 0;
+	if(host_client->netconnection)
+	{
+		for (j = 0;j < NETGRAPH_PACKETS;j++)
+			if (host_client->netconnection->incoming_netgraph[j].unreliablebytes == NETGRAPH_LOSTPACKET)
+				packetloss++;
+		for (j = 0;j < NETGRAPH_PACKETS;j++)
+			if (host_client->movement_count[j] < 0)
+				movementloss++;
+	}
 
-	return true;
+	VectorCopy(move->viewangles, PRVM_serveredictvector(host_client->edict, v_angle));
+	PRVM_serveredictfloat(host_client->edict, button3) = ((move->buttons >> 2) & 1);
+	PRVM_serveredictfloat(host_client->edict, button4) = ((move->buttons >> 3) & 1);
+	PRVM_serveredictfloat(host_client->edict, button5) = ((move->buttons >> 4) & 1);
+	PRVM_serveredictfloat(host_client->edict, button6) = ((move->buttons >> 5) & 1);
+	PRVM_serveredictfloat(host_client->edict, button7) = ((move->buttons >> 6) & 1);
+	PRVM_serveredictfloat(host_client->edict, button8) = ((move->buttons >> 7) & 1);
+	PRVM_serveredictfloat(host_client->edict, button9) = ((move->buttons >> 11) & 1);
+	PRVM_serveredictfloat(host_client->edict, button10) = ((move->buttons >> 12) & 1);
+	PRVM_serveredictfloat(host_client->edict, button11) = ((move->buttons >> 13) & 1);
+	PRVM_serveredictfloat(host_client->edict, button12) = ((move->buttons >> 14) & 1);
+	PRVM_serveredictfloat(host_client->edict, button13) = ((move->buttons >> 15) & 1);
+	PRVM_serveredictfloat(host_client->edict, button14) = ((move->buttons >> 16) & 1);
+	PRVM_serveredictfloat(host_client->edict, button15) = ((move->buttons >> 17) & 1);
+	PRVM_serveredictfloat(host_client->edict, button16) = ((move->buttons >> 18) & 1);
+	PRVM_serveredictfloat(host_client->edict, buttonuse) = ((move->buttons >> 8) & 1);
+	PRVM_serveredictfloat(host_client->edict, buttonchat) = ((move->buttons >> 9) & 1);
+	PRVM_serveredictfloat(host_client->edict, cursor_active) = ((move->buttons >> 10) & 1);
+	VectorSet(PRVM_serveredictvector(host_client->edict, movement), move->forwardmove, move->sidemove, move->upmove);
+	VectorCopy(move->cursor_screen, PRVM_serveredictvector(host_client->edict, cursor_screen));
+	VectorCopy(move->cursor_start, PRVM_serveredictvector(host_client->edict, cursor_trace_start));
+	VectorCopy(move->cursor_impact, PRVM_serveredictvector(host_client->edict, cursor_trace_endpos));
+	PRVM_serveredictedict(host_client->edict, cursor_trace_ent) = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM(move->cursor_entitynumber));
+	PRVM_serveredictfloat(host_client->edict, ping) = host_client->ping * 1000.0;
+	PRVM_serveredictfloat(host_client->edict, ping_packetloss) = packetloss / (float) NETGRAPH_PACKETS;
+	PRVM_serveredictfloat(host_client->edict, ping_movementloss) = movementloss / (float) NETGRAPH_PACKETS;
 }
 
+static qbool SV_FrameLost(int framenum)
+{
+	if (host_client->entitydatabase5)
+	{
+		if (framenum <= host_client->entitydatabase5->latestframenum)
+		{
+			EntityFrame5_LostFrame(host_client->entitydatabase5, framenum);
+			EntityFrameCSQC_LostFrame(host_client, framenum);
+			return true;
+		}
+	}
+	return false;
+}
+
+static void SV_FrameAck(int framenum)
+{
+	if (host_client->entitydatabase)
+		EntityFrame_AckFrame(host_client->entitydatabase, framenum);
+	else if (host_client->entitydatabase4)
+		EntityFrame4_AckFrame(host_client->entitydatabase4, framenum, true);
+	else if (host_client->entitydatabase5)
+		EntityFrame5_AckFrame(host_client->entitydatabase5, framenum);
+}
 
 /*
-==================
-SV_RunClients
-==================
+===================
+SV_ReadClientMessage
+===================
 */
-void SV_RunClients (void)
+void SV_ReadClientMessage(void)
 {
-	int				i;
+	prvm_prog_t *prog = SVVM_prog;
+	int netcmd, num, start;
+	char *s, *p, *q;
+
+	if(sv_autodemo_perclient.integer >= 2)
+		SV_WriteDemoMessage(host_client, &(host_client->netconnection->message), true);
 
-	for (i=0, host_client = svs.clients ; i<svs.maxclients ; i++, host_client++)
+	//MSG_BeginReading ();
+	sv_numreadmoves = 0;
+
+	for(;;)
 	{
 		if (!host_client->active)
-			continue;
-	
-		sv_player = host_client->edict;
+		{
+			// a command caused an error
+			SV_DropClient (false);
+			return;
+		}
 
-		if (!SV_ReadClientMessage ())
+		if (sv_message.badread)
 		{
-			SV_DropClient (false);	// client misbehaved...
-			continue;
+			Con_Print("SV_ReadClientMessage: badread\n");
+			SV_DropClient (false);
+			return;
 		}
 
-		if (!host_client->spawned)
+		netcmd = MSG_ReadByte(&sv_message);
+		if (netcmd == -1)
 		{
-		// clear client movement until a new packet is received
-			memset (&host_client->cmd, 0, sizeof(host_client->cmd));
-			continue;
+			// end of message
+			// apply the moves that were read this frame
+			SV_ExecuteClientMoves();
+			break;
 		}
 
-// always pause in single player if in console or menus
-		if (!sv.paused && (svs.maxclients > 1 || key_dest == key_game) )
+		switch (netcmd)
 		{
-			// LordHavoc: QuakeC replacement for SV_ClientThink (player movement)
-			if (SV_PlayerPhysicsQC)
+		default:
+			Con_Printf("SV_ReadClientMessage: unknown command char %i (at offset 0x%x)\n", netcmd, sv_message.readcount);
+			if (developer_networking.integer)
+				Com_HexDumpToConsole(sv_message.data, sv_message.cursize);
+			SV_DropClient (false);
+			return;
+
+		case clc_nop:
+			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(&sv_message, sv_readstring, sizeof(sv_readstring));
+			q = NULL;
+			for(p = s; *p; ++p) switch(*p)
 			{
-				pr_global_struct->time = sv.time;
-				pr_global_struct->self = EDICT_TO_PROG(sv_player);
-				PR_ExecuteProgram ((func_t)(SV_PlayerPhysicsQC - pr_functions), "");
+				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 (cmd_serverfromclient, s, src_client, true);
+			else if (PRVM_serverfunction(SV_ParseClientCommand))
+			{
+				int restorevm_tempstringsbuf_cursize;
+				restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
+				PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, s);
+				PRVM_serverglobalfloat(time) = sv.time;
+				PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(host_client->edict);
+				prog->ExecuteProgram(prog, PRVM_serverfunction(SV_ParseClientCommand), "QC function SV_ParseClientCommand is missing");
+				prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 			}
 			else
-				SV_ClientThink ();
+				Cmd_ExecuteString (cmd_serverfromclient, s, src_client, true);
+			break;
+
+clc_stringcmd_invalid:
+			Con_Printf("Received invalid stringcmd from %s\n", host_client->name);
+			if(developer.integer > 0)
+				Com_HexDumpToConsole((unsigned char *) s, (int)strlen(s));
+			break;
+
+		case clc_disconnect:
+			SV_DropClient (false); // client wants to disconnect
+			return;
+
+		case clc_move:
+			SV_ReadClientMove();
+			break;
+
+		case clc_ackdownloaddata:
+			start = MSG_ReadLong(&sv_message);
+			num = MSG_ReadShort(&sv_message);
+			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 = (unsigned char *) 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)
+						SV_ClientCommands("\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 (sv_message.badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+			num = MSG_ReadLong(&sv_message);
+			if (sv_message.badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+			if (developer_networkentities.integer >= 10)
+				Con_Printf("recv clc_ackframe %i\n", 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->begun && host_client->latestframenum < num)
+			{
+				int i;
+				for (i = host_client->latestframenum + 1;i < num;i++)
+					if (!SV_FrameLost(i))
+						break;
+				SV_FrameAck(num);
+				host_client->latestframenum = num;
+			}
+			break;
 		}
 	}
 }