X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_user.c;h=0cc8d24cf9060b9bdc2532a849c9983bc9d462d3;hp=dec9d6c13868b153e1e228500156bff014e7079c;hb=cb642c507a7bc68ddf0f021347372d7dbb1d76d5;hpb=196c4c8e541286c927af083580bb0d80ee8c7959

diff --git a/sv_user.c b/sv_user.c
index dec9d6c1..0cc8d24c 100644
--- a/sv_user.c
+++ b/sv_user.c
@@ -21,11 +21,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #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"};
+cvar_t sv_edgefriction = {0, "edgefriction", "2", "how much you slow down when nearing a ledge you might fall off"};
+cvar_t sv_idealpitchscale = {0, "sv_idealpitchscale","0.8", "how much to look up/down slopes and stairs when not using freelook"};
+cvar_t sv_maxspeed = {CVAR_NOTIFY, "sv_maxspeed", "320", "maximum speed a player can accelerate to when on ground (can be exceeded by tricks)"};
+cvar_t sv_maxairspeed = {0, "sv_maxairspeed", "30", "maximum speed a player can accelerate to when airborn (note that it is possible to completely stop by moving the opposite direction)"};
+cvar_t sv_accelerate = {0, "sv_accelerate", "10", "rate at which a player accelerates to sv_maxspeed"};
+cvar_t sv_airaccelerate = {0, "sv_airaccelerate", "-1", "rate at which a player accelerates to sv_maxairspeed while in the air, if less than 0 the sv_accelerate variable is used instead"};
+cvar_t sv_wateraccelerate = {0, "sv_wateraccelerate", "-1", "rate at which a player accelerates to sv_maxspeed while in the air, if less than 0 the sv_accelerate variable is used instead"};
 
 static usercmd_t cmd;
 
@@ -38,25 +40,25 @@ 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->v->flags & FL_ONGROUND))
+	if (!((int)host_client->edict->fields.server->flags & FL_ONGROUND))
 		return;
 
-	angleval = host_client->edict->v->angles[YAW] * M_PI*2 / 360;
+	angleval = host_client->edict->fields.server->angles[YAW] * M_PI*2 / 360;
 	sinval = sin(angleval);
 	cosval = cos(angleval);
 
 	for (i=0 ; i<MAX_FORWARD ; i++)
 	{
-		top[0] = host_client->edict->v->origin[0] + cosval*(i+3)*12;
-		top[1] = host_client->edict->v->origin[1] + sinval*(i+3)*12;
-		top[2] = host_client->edict->v->origin[2] + host_client->edict->v->view_ofs[2];
+		top[0] = host_client->edict->fields.server->origin[0] + cosval*(i+3)*12;
+		top[1] = host_client->edict->fields.server->origin[1] + sinval*(i+3)*12;
+		top[2] = host_client->edict->fields.server->origin[2] + host_client->edict->fields.server->view_ofs[2];
 
 		bottom[0] = top[0];
 		bottom[1] = top[1];
@@ -92,16 +94,15 @@ void SV_SetIdealPitch (void)
 
 	if (!dir)
 	{
-		host_client->edict->v->idealpitch = 0;
+		host_client->edict->fields.server->idealpitch = 0;
 		return;
 	}
 
 	if (steps < 2)
 		return;
-	host_client->edict->v->idealpitch = -dir * sv_idealpitchscale.value;
+	host_client->edict->fields.server->idealpitch = -dir * sv_idealpitchscale.value;
 }
 
-#if 1
 static vec3_t wishdir, forward, right, up;
 static float wishspeed;
 
@@ -119,14 +120,14 @@ void SV_UserFriction (void)
 	vec3_t start, stop;
 	trace_t trace;
 
-	speed = sqrt(host_client->edict->v->velocity[0]*host_client->edict->v->velocity[0]+host_client->edict->v->velocity[1]*host_client->edict->v->velocity[1]);
+	speed = sqrt(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 (!speed)
 		return;
 
 	// if the leading edge is over a dropoff, increase friction
-	start[0] = stop[0] = host_client->edict->v->origin[0] + host_client->edict->v->velocity[0]/speed*16;
-	start[1] = stop[1] = host_client->edict->v->origin[1] + host_client->edict->v->velocity[1]/speed*16;
-	start[2] = host_client->edict->v->origin[2] + host_client->edict->v->mins[2];
+	start[0] = stop[0] = host_client->edict->fields.server->origin[0] + host_client->edict->fields.server->velocity[0]/speed*16;
+	start[1] = stop[1] = host_client->edict->fields.server->origin[1] + host_client->edict->fields.server->velocity[1]/speed*16;
+	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);
@@ -145,7 +146,7 @@ void SV_UserFriction (void)
 	else
 		newspeed /= speed;
 
-	VectorScale(host_client->edict->v->velocity, newspeed, host_client->edict->v->velocity);
+	VectorScale(host_client->edict->fields.server->velocity, newspeed, host_client->edict->fields.server->velocity);
 }
 
 /*
@@ -158,7 +159,7 @@ void SV_Accelerate (void)
 	int i;
 	float addspeed, accelspeed, currentspeed;
 
-	currentspeed = DotProduct (host_client->edict->v->velocity, wishdir);
+	currentspeed = DotProduct (host_client->edict->fields.server->velocity, wishdir);
 	addspeed = wishspeed - currentspeed;
 	if (addspeed <= 0)
 		return;
@@ -167,7 +168,7 @@ void SV_Accelerate (void)
 		accelspeed = addspeed;
 
 	for (i=0 ; i<3 ; i++)
-		host_client->edict->v->velocity[i] += accelspeed*wishdir[i];
+		host_client->edict->fields.server->velocity[i] += accelspeed*wishdir[i];
 }
 
 void SV_AirAccelerate (vec3_t wishveloc)
@@ -176,34 +177,34 @@ void SV_AirAccelerate (vec3_t wishveloc)
 	float addspeed, wishspd, accelspeed, currentspeed;
 
 	wishspd = VectorNormalizeLength (wishveloc);
-	if (wishspd > 30)
-		wishspd = 30;
-	currentspeed = DotProduct (host_client->edict->v->velocity, wishveloc);
+	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;
 
 	for (i=0 ; i<3 ; i++)
-		host_client->edict->v->velocity[i] += accelspeed*wishveloc[i];
+		host_client->edict->fields.server->velocity[i] += accelspeed*wishveloc[i];
 }
 
 
 void DropPunchAngle (void)
 {
 	float len;
-	eval_t *val;
+	prvm_eval_t *val;
 
-	len = VectorNormalizeLength (host_client->edict->v->punchangle);
+	len = VectorNormalizeLength (host_client->edict->fields.server->punchangle);
 
 	len -= 10*sv.frametime;
 	if (len < 0)
 		len = 0;
-	VectorScale (host_client->edict->v->punchangle, len, host_client->edict->v->punchangle);
+	VectorScale (host_client->edict->fields.server->punchangle, len, host_client->edict->fields.server->punchangle);
 
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_punchvector)))
+	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_punchvector)))
 	{
 		len = VectorNormalizeLength (val->vector);
 
@@ -224,16 +225,16 @@ void SV_FreeMove (void)
 	int i;
 	float wishspeed;
 
-	AngleVectors (host_client->edict->v->v_angle, forward, right, up);
+	AngleVectors (host_client->edict->fields.server->v_angle, forward, right, up);
 
 	for (i = 0; i < 3; i++)
-		host_client->edict->v->velocity[i] = forward[i] * cmd.forwardmove + right[i] * cmd.sidemove;
+		host_client->edict->fields.server->velocity[i] = forward[i] * cmd.forwardmove + right[i] * cmd.sidemove;
 
-	host_client->edict->v->velocity[2] += cmd.upmove;
+	host_client->edict->fields.server->velocity[2] += cmd.upmove;
 
-	wishspeed = VectorLength(host_client->edict->v->velocity);
+	wishspeed = VectorLength(host_client->edict->fields.server->velocity);
 	if (wishspeed > sv_maxspeed.value)
-		VectorScale(host_client->edict->v->velocity, sv_maxspeed.value / wishspeed, host_client->edict->v->velocity);
+		VectorScale(host_client->edict->fields.server->velocity, sv_maxspeed.value / wishspeed, host_client->edict->fields.server->velocity);
 }
 
 /*
@@ -249,7 +250,7 @@ void SV_WaterMove (void)
 	float speed, newspeed, wishspeed, addspeed, accelspeed, temp;
 
 	// user intentions
-	AngleVectors (host_client->edict->v->v_angle, forward, right, up);
+	AngleVectors (host_client->edict->fields.server->v_angle, forward, right, up);
 
 	for (i=0 ; i<3 ; i++)
 		wishvel[i] = forward[i]*cmd.forwardmove + right[i]*cmd.sidemove;
@@ -269,14 +270,14 @@ void SV_WaterMove (void)
 	wishspeed *= 0.7;
 
 	// water friction
-	speed = VectorLength(host_client->edict->v->velocity);
+	speed = VectorLength(host_client->edict->fields.server->velocity);
 	if (speed)
 	{
 		newspeed = speed - sv.frametime * speed * sv_friction.value;
 		if (newspeed < 0)
 			newspeed = 0;
 		temp = newspeed/speed;
-		VectorScale(host_client->edict->v->velocity, temp, host_client->edict->v->velocity);
+		VectorScale(host_client->edict->fields.server->velocity, temp, host_client->edict->fields.server->velocity);
 	}
 	else
 		newspeed = 0;
@@ -290,23 +291,23 @@ 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;
 
 	for (i=0 ; i<3 ; i++)
-		host_client->edict->v->velocity[i] += accelspeed * wishvel[i];
+		host_client->edict->fields.server->velocity[i] += accelspeed * wishvel[i];
 }
 
 void SV_WaterJump (void)
 {
-	if (sv.time > host_client->edict->v->teleport_time || !host_client->edict->v->waterlevel)
+	if (sv.time > host_client->edict->fields.server->teleport_time || !host_client->edict->fields.server->waterlevel)
 	{
-		host_client->edict->v->flags = (int)host_client->edict->v->flags & ~FL_WATERJUMP;
-		host_client->edict->v->teleport_time = 0;
+		host_client->edict->fields.server->flags = (int)host_client->edict->fields.server->flags & ~FL_WATERJUMP;
+		host_client->edict->fields.server->teleport_time = 0;
 	}
-	host_client->edict->v->velocity[0] = host_client->edict->v->movedir[0];
-	host_client->edict->v->velocity[1] = host_client->edict->v->movedir[1];
+	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];
 }
 
 
@@ -324,20 +325,20 @@ void SV_AirMove (void)
 
 	// LordHavoc: correct quake movement speed bug when looking up/down
 	wishvel[0] = wishvel[2] = 0;
-	wishvel[1] = host_client->edict->v->angles[1];
+	wishvel[1] = host_client->edict->fields.server->angles[1];
 	AngleVectors (wishvel, forward, right, up);
 
 	fmove = cmd.forwardmove;
 	smove = cmd.sidemove;
 
 // hack to not let you back into teleporter
-	if (sv.time < host_client->edict->v->teleport_time && fmove < 0)
+	if (sv.time < host_client->edict->fields.server->teleport_time && fmove < 0)
 		fmove = 0;
 
 	for (i=0 ; i<3 ; i++)
 		wishvel[i] = forward[i]*fmove + right[i]*smove;
 
-	if ((int)host_client->edict->v->movetype != MOVETYPE_WALK)
+	if ((int)host_client->edict->fields.server->movetype != MOVETYPE_WALK)
 		wishvel[2] += cmd.upmove;
 
 	VectorCopy (wishvel, wishdir);
@@ -349,10 +350,10 @@ void SV_AirMove (void)
 		wishspeed = sv_maxspeed.value;
 	}
 
-	if (host_client->edict->v->movetype == MOVETYPE_NOCLIP)
+	if (host_client->edict->fields.server->movetype == MOVETYPE_NOCLIP)
 	{
 		// noclip
-		VectorCopy (wishvel, host_client->edict->v->velocity);
+		VectorCopy (wishvel, host_client->edict->fields.server->velocity);
 	}
 	else if ( onground )
 	{
@@ -378,30 +379,30 @@ void SV_ClientThink (void)
 {
 	vec3_t v_angle;
 
-	if (host_client->edict->v->movetype == MOVETYPE_NONE)
+	if (host_client->edict->fields.server->movetype == MOVETYPE_NONE)
 		return;
 
-	onground = (int)host_client->edict->v->flags & FL_ONGROUND;
+	onground = (int)host_client->edict->fields.server->flags & FL_ONGROUND;
 
 	DropPunchAngle ();
 
 	// if dead, behave differently
-	if (host_client->edict->v->health <= 0)
+	if (host_client->edict->fields.server->health <= 0)
 		return;
 
 	cmd = host_client->cmd;
 
 	// angles
 	// show 1/3 the pitch angle and all the roll angle
-	VectorAdd (host_client->edict->v->v_angle, host_client->edict->v->punchangle, v_angle);
-	host_client->edict->v->angles[ROLL] = V_CalcRoll (host_client->edict->v->angles, host_client->edict->v->velocity)*4;
-	if (!host_client->edict->v->fixangle)
+	VectorAdd (host_client->edict->fields.server->v_angle, host_client->edict->fields.server->punchangle, v_angle);
+	host_client->edict->fields.server->angles[ROLL] = V_CalcRoll (host_client->edict->fields.server->angles, host_client->edict->fields.server->velocity)*4;
+	if (!host_client->edict->fields.server->fixangle)
 	{
-		host_client->edict->v->angles[PITCH] = -v_angle[PITCH]/3;
-		host_client->edict->v->angles[YAW] = v_angle[YAW];
+		host_client->edict->fields.server->angles[PITCH] = -v_angle[PITCH]/3;
+		host_client->edict->fields.server->angles[YAW] = v_angle[YAW];
 	}
 
-	if ( (int)host_client->edict->v->flags & FL_WATERJUMP )
+	if ( (int)host_client->edict->fields.server->flags & FL_WATERJUMP )
 	{
 		SV_WaterJump ();
 		return;
@@ -409,8 +410,8 @@ void SV_ClientThink (void)
 
 	/*
 	// Player is (somehow) outside of the map, or flying, or noclipping
-	if (host_client->edict->v->movetype != MOVETYPE_NOCLIP && (host_client->edict->v->movetype == MOVETYPE_FLY || SV_TestEntityPosition (host_client->edict)))
-	//if (host_client->edict->v->movetype == MOVETYPE_NOCLIP || host_client->edict->v->movetype == MOVETYPE_FLY || SV_TestEntityPosition (host_client->edict))
+	if (host_client->edict->fields.server->movetype != MOVETYPE_NOCLIP && (host_client->edict->fields.server->movetype == MOVETYPE_FLY || SV_TestEntityPosition (host_client->edict)))
+	//if (host_client->edict->fields.server->movetype == MOVETYPE_NOCLIP || host_client->edict->fields.server->movetype == MOVETYPE_FLY || SV_TestEntityPosition (host_client->edict))
 	{
 		SV_FreeMove ();
 		return;
@@ -418,7 +419,7 @@ void SV_ClientThink (void)
 	*/
 
 	// walk
-	if ((host_client->edict->v->waterlevel >= 2) && (host_client->edict->v->movetype != MOVETYPE_NOCLIP))
+	if ((host_client->edict->fields.server->waterlevel >= 2) && (host_client->edict->fields.server->movetype != MOVETYPE_NOCLIP))
 	{
 		SV_WaterMove ();
 		return;
@@ -427,257 +428,83 @@ void SV_ClientThink (void)
 	SV_AirMove ();
 }
 
-#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->v->movetype == MOVETYPE_NONE)
-		return;
-
-	f = DotProduct(host_client->edict->v->punchangle, host_client->edict->v->punchangle);
-	if (f)
-	{
-		limit = sqrt(f);
-		f = (limit - 10 * sv.frametime);
-		f /= limit;
-		f = max(0, f);
-		VectorScale(host_client->edict->v->punchangle, f, host_client->edict->v->punchangle);
-	}
-
-	// if dead, behave differently
-	if (host_client->edict->v->health <= 0)
-		return;
-
-	AngleVectors(host_client->edict->v->v_angle, v_forward, v_right, v_up);
-	// show 1/3 the pitch angle and all the roll angle
-	f = DotProduct(host_client->edict->v->velocity, v_right) * (1.0 / cl_rollspeed.value);
-	host_client->edict->v->angles[2] = bound(-1, f, 1) * cl_rollangle.value * 4;
-	if (!host_client->edict->v->fixangle)
-	{
-		host_client->edict->v->angles[0] = (host_client->edict->v->v_angle[0] + host_client->edict->v->punchangle[0]) * -0.333;
-		host_client->edict->v->angles[1] = host_client->edict->v->v_angle[1] + host_client->edict->v->punchangle[1];
-	}
-
-	if ((int)host_client->edict->v->flags & FL_WATERJUMP)
-	{
-		host_client->edict->v->velocity[0] = host_client->edict->v->movedir[0];
-		host_client->edict->v->velocity[1] = host_client->edict->v->movedir[1];
-		if (sv.time > host_client->edict->v->teleport_time || host_client->edict->v->waterlevel == 0)
-		{
-			host_client->edict->v->flags = (int)host_client->edict->v->flags - ((int)host_client->edict->v->flags & FL_WATERJUMP);
-			host_client->edict->v->teleport_time = 0;
-		}
-		return;
-	}
-
-	// swim
-	if (host_client->edict->v->waterlevel >= 2)
-	if (host_client->edict->v->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->v->velocity) * (1 - sv.frametime * sv_friction.value);
-		if (f > 0)
-			f /= VectorLength(host_client->edict->v->velocity);
-		else
-			f = 0;
-		VectorScale(host_client->edict->v->velocity, f, host_client->edict->v->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->v->velocity, f, wishvel, host_client->edict->v->velocity);
-		return;
-	}
-
-	// if not flying, move horizontally only
-	if (host_client->edict->v->movetype != MOVETYPE_FLY)
-	{
-		VectorClear(wishvel);
-		wishvel[1] = host_client->edict->v->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->v->teleport_time || host_client->cmd.forwardmove > 0)
-		VectorMA(wishvel, host_client->cmd.forwardmove, v_forward, wishvel);
-	if (host_client->edict->v->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->v->movetype == MOVETYPE_NOCLIP || host_client->edict->v->movetype == MOVETYPE_FLY)
-	{
-		VectorScale(wishdir, wishspeed, host_client->edict->v->velocity);
-		return;
-	}
-
-	if ((int)host_client->edict->v->flags & FL_ONGROUND) // walking
-	{
-		// friction
-		f = host_client->edict->v->velocity[0] * host_client->edict->v->velocity[0] + host_client->edict->v->velocity[1] * host_client->edict->v->velocity[1];
-		if (f)
-		{
-			f = sqrt(f);
-			VectorCopy(host_client->edict->v->velocity, v);
-			v[2] = 0;
-
-			// if the leading edge is over a dropoff, increase friction
-			limit = 16.0f / f;
-			VectorMA(host_client->edict->v->origin, limit, v, v);
-			v[2] += host_client->edict->v->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->v->velocity, f, host_client->edict->v->velocity);
-		}
-	}
-	else // airborn
-		wishspeed = min(wishspeed, 30);
-
-	// ground or air acceleration
-	f = wishspeed - DotProduct(host_client->edict->v->velocity, wishdir);
-	if (f > 0)
-	{
-		limit = sv_accelerate.value * sv.frametime * wishspeed;
-		if (f > limit)
-			f = limit;
-		VectorMA(host_client->edict->v->velocity, f, wishdir, host_client->edict->v->velocity);
-	}
-}
-#endif
-
 /*
 ===================
 SV_ReadClientMove
 ===================
 */
-void SV_ReadClientMove (usercmd_t *move)
+qboolean SV_ReadClientMove (void)
 {
+	qboolean kickplayer = false;
 	int i;
-	vec3_t angle;
-	int bits;
-	eval_t *val;
-	float total;
+	double oldmovetime;
+#ifdef NUM_PING_TIMES
+	double total;
+#endif
+	usercmd_t *move = &host_client->cmd;
+
+	oldmovetime = move->time;
+
+	// if this move has been applied, clear it, and start accumulating new data
+	if (move->applied)
+		memset(move, 0, sizeof(*move));
 
-	// read ping time
 	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
-	host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = sv.time - MSG_ReadFloat ();
+
+	// 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)
+		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;
+
+	// calculate average ping time
+	host_client->ping = move->receivetime - move->time;
+#ifdef NUM_PING_TIMES
+	host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = move->receivetime - move->time;
 	host_client->num_pings++;
 	for (i=0, total = 0;i < NUM_PING_TIMES;i++)
 		total += host_client->ping_times[i];
-	// can be used for prediction
 	host_client->ping = total / NUM_PING_TIMES;
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_ping)))
-		val->_float = host_client->ping * 1000.0;
+#endif
 
 	// read current angles
 	for (i = 0;i < 3;i++)
 	{
-		if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
-		if (sv.protocol == PROTOCOL_QUAKE)
-			angle[i] = MSG_ReadAngle8i();
+		if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE)
+			move->viewangles[i] = MSG_ReadAngle8i();
+		else if (sv.protocol == PROTOCOL_DARKPLACES1)
+			move->viewangles[i] = MSG_ReadAngle16i();
 		else if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3)
-			angle[i] = MSG_ReadAngle32f();
-		else if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6)
-			angle[i] = MSG_ReadAngle16i();
-		if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+			move->viewangles[i] = MSG_ReadAngle32f();
+		else
+			move->viewangles[i] = MSG_ReadAngle16i();
 	}
-
-	VectorCopy (angle, host_client->edict->v->v_angle);
+	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 
 	// read movement
-	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 	move->forwardmove = MSG_ReadCoord16i ();
-	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 	move->sidemove = MSG_ReadCoord16i ();
-	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 	move->upmove = MSG_ReadCoord16i ();
 	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
-	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
-	if (sv.protocol == PROTOCOL_DARKPLACES6)
-		bits = MSG_ReadLong ();
+	// 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_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
+		move->buttons |= MSG_ReadByte ();
 	else
-		bits = MSG_ReadByte ();
+		move->buttons |= MSG_ReadLong ();
 	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
-	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);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_buttonuse))) val->_float = ((bits >> 8) & 1);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_buttonchat))) val->_float = ((bits >> 9) & 1);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_active))) val->_float = ((bits >> 10) & 1);
 
+	// read impulse
 	i = MSG_ReadByte ();
-	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 	if (i)
-		host_client->edict->v->impulse = i;
+		move->impulse = i;
+	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 
 	// PRYDON_CLIENTCURSOR
-	if (sv.protocol == PROTOCOL_DARKPLACES6)
+	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)
 	{
 		// 30 bytes
 		move->cursor_screen[0] = MSG_ReadShort() * (1.0f / 32767.0f);
@@ -688,23 +515,102 @@ void SV_ReadClientMove (usercmd_t *move)
 		move->cursor_impact[0] = MSG_ReadFloat();
 		move->cursor_impact[1] = MSG_ReadFloat();
 		move->cursor_impact[2] = MSG_ReadFloat();
-		move->cursor_entitynumber = MSG_ReadShort();
+		move->cursor_entitynumber = (unsigned short)MSG_ReadShort();
+		if (move->cursor_entitynumber >= prog->max_edicts)
+		{
+			Con_DPrintf("SV_ReadClientMessage: client send bad cursor_entitynumber\n");
+			move->cursor_entitynumber = 0;
+		}
 		// as requested by FrikaC, cursor_trace_ent is reset to world if the
 		// entity is free at time of receipt
-		if (EDICT_NUM(move->cursor_entitynumber)->e->freed)
+		if (PRVM_EDICT_NUM(move->cursor_entitynumber)->priv.server->free)
 			move->cursor_entitynumber = 0;
 		if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 	}
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_screen))) VectorCopy(move->cursor_screen, val->vector);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_start))) VectorCopy(move->cursor_start, val->vector);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_endpos))) VectorCopy(move->cursor_impact, val->vector);
-	if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_ent))) val->edict = EDICT_TO_PROG(EDICT_NUM(move->cursor_entitynumber));
+
+	if (!host_client->spawned)
+		memset(move, 0, sizeof(*move));
+	else if (move->time > (float)sv.time + 0.001f) // add a little fuzz factor due to float precision issues
+	{
+		Con_DPrintf("client move->time %f > sv.time %f, kicking\n", move->time, sv.time);
+		// if the client is lying about time, we have definitively detected a
+		// speed cheat attempt of the worst sort, and we can immediately kick
+		// the offending player off.
+		// this fixes the timestamp to prevent a speed cheat from working
+		move->time = sv.time;
+		// but we kick the player for good measure
+		kickplayer = true;
+	}
+	else
+	{
+		// apply the latest accepted move to the entity fields
+		host_client->movesequence = move->sequence;
+		if (host_client->movesequence)
+		{
+			double frametime = bound(0, move->time - oldmovetime, 0.1);
+			double oldframetime = prog->globals.server->frametime;
+			//if (move->time - oldmovetime >= 0.1001)
+			//	Con_DPrintf("client move exceeds 100ms!  (time %f -> time %f)\n", oldmovetime, move->time);
+			prog->globals.server->frametime = frametime;
+			SV_Physics_ClientEntity(host_client->edict);
+			prog->globals.server->frametime = oldframetime;
+		}
+	}
+	return kickplayer;
+}
+
+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_button9))) val->_float = ((move->buttons >> 11) & 1);
+	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button10))) val->_float = ((move->buttons >> 12) & 1);
+	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button11))) val->_float = ((move->buttons >> 13) & 1);
+	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button12))) val->_float = ((move->buttons >> 14) & 1);
+	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button13))) val->_float = ((move->buttons >> 15) & 1);
+	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button14))) val->_float = ((move->buttons >> 16) & 1);
+	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button15))) val->_float = ((move->buttons >> 17) & 1);
+	if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_button16))) val->_float = ((move->buttons >> 18) & 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;
 }
 
 void SV_FrameLost(int framenum)
 {
 	if (host_client->entitydatabase5)
-		EntityFrame5_LostFrame(host_client->entitydatabase5, framenum, host_client - svs.clients + 1);
+		EntityFrame5_LostFrame(host_client->entitydatabase5, framenum);
 }
 
 void SV_FrameAck(int framenum)
@@ -746,7 +652,7 @@ void SV_ReadClientMessage(void)
 			return;
 		}
 
-		cmd = MSG_ReadChar ();
+		cmd = MSG_ReadByte ();
 		if (cmd == -1)
 		{
 			// end of message
@@ -771,9 +677,9 @@ void SV_ReadClientMessage(void)
 				Cmd_ExecuteString (s, src_client);
 			else if (SV_ParseClientCommandQC)
 			{
-				G_INT(OFS_PARM0) = PR_SetString(s);
-				pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
-				PR_ExecuteProgram ((func_t)(SV_ParseClientCommandQC - pr_functions), "QC function SV_ParseClientCommand is missing");
+				PRVM_G_INT(OFS_PARM0) = PRVM_SetEngineString(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");
 			}
 			else if (strncasecmp(s, "status", 6) == 0
 			 || strncasecmp(s, "name", 4) == 0
@@ -788,6 +694,8 @@ void SV_ReadClientMessage(void)
 			 || 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);
@@ -800,7 +708,9 @@ void SV_ReadClientMessage(void)
 			return;
 
 		case clc_move:
-			SV_ReadClientMove (&host_client->cmd);
+			// if ReadClientMove returns true, the client tried to speed cheat
+			if (SV_ReadClientMove ())
+				SV_DropClient (false);
 			break;
 
 		case clc_ackframe:
@@ -809,7 +719,10 @@ void SV_ReadClientMessage(void)
 			if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 			if (developer_networkentities.integer >= 1)
 				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++)
@@ -822,48 +735,3 @@ void SV_ReadClientMessage(void)
 	}
 }
 
-/*
-==================
-SV_RunClients
-==================
-*/
-void SV_RunClients (void)
-{
-	int i;
-
-	for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
-	{
-		if (!host_client->active)
-			continue;
-
-		if (!host_client->spawned)
-		{
-			// clear client movement until a new packet is received
-			memset (&host_client->cmd, 0, sizeof(host_client->cmd));
-			continue;
-		}
-
-		if (sv.frametime)
-		{
-			// LordHavoc: QuakeC replacement for SV_ClientThink (player movement)
-			if (SV_PlayerPhysicsQC)
-			{
-				pr_global_struct->time = sv.time;
-				pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
-				PR_ExecuteProgram ((func_t)(SV_PlayerPhysicsQC - pr_functions), "QC function SV_PlayerPhysics is missing");
-			}
-			else
-				SV_ClientThink ();
-
-			SV_CheckVelocity(host_client->edict);
-
-			// LordHavoc: a hack to ensure that the (rather silly) id1 quakec
-			// player_run/player_stand1 does not horribly malfunction if the
-			// velocity becomes a number that is both == 0 and != 0
-			// (sounds to me like NaN but to be absolutely safe...)
-			if (DotProduct(host_client->edict->v->velocity, host_client->edict->v->velocity) < 0.0001)
-				VectorClear(host_client->edict->v->velocity);
-		}
-	}
-}
-