X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_user.c;h=147a5552d4f1001794df93ce07d1d20e4a64a374;hp=8ddff9948e7a980a1d89973871eb62bd6f3a8c26;hb=ea4fc545e8444f579d88d8f096b054dcd7bc482f;hpb=6a384398c93b7e2bc1936427797909eb60094160

diff --git a/sv_user.c b/sv_user.c
index 8ddff994..147a5552 100644
--- a/sv_user.c
+++ b/sv_user.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,28 +21,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-edict_t	*sv_player;
+edict_t *sv_player;
 
-extern	cvar_t	sv_friction;
-cvar_t	sv_edgefriction = {"edgefriction", "2"};
-cvar_t	sv_predict = {"sv_predict", "1"};
-extern	cvar_t	sv_stopspeed;
+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"};
 
-static	vec3_t		forward, right, up;
-
-vec3_t	wishdir;
-float	wishspeed;
-
-// world
-float	*angles;
-float	*origin;
-float	*velocity;
-
-qboolean	onground;
-
-usercmd_t	cmd;
-
-cvar_t	sv_idealpitchscale = {"sv_idealpitchscale","0.8"};
+static usercmd_t cmd;
 
 
 /*
@@ -60,33 +47,35 @@ void SV_SetIdealPitch (void)
 	int		i, j;
 	int		step, dir, steps;
 
-	if (!((int)sv_player->v.flags & FL_ONGROUND))
+	if (!((int)sv_player->v->flags & FL_ONGROUND))
 		return;
-		
-	angleval = sv_player->v.angles[YAW] * M_PI*2 / 360;
+
+	angleval = sv_player->v->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] = 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];
+
 		bottom[0] = top[0];
 		bottom[1] = top[1];
 		bottom[2] = top[2] - 160;
-		
-		tr = SV_Move (top, vec3_origin, vec3_origin, bottom, 1, sv_player);
-		if (tr.allsolid)
-			return;	// looking at a wall, leave ideal the way is was
 
+		tr = SV_Move (top, vec3_origin, vec3_origin, bottom, MOVE_NOMONSTERS, sv_player);
+		// 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 +84,30 @@ 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;
+		sv_player->v->idealpitch = 0;
 		return;
 	}
-	
+
 	if (steps < 2)
 		return;
-	sv_player->v.idealpitch = -dir * sv_idealpitchscale.value;
+	sv_player->v->idealpitch = -dir * sv_idealpitchscale.value;
 }
 
+#if 1
+static vec3_t wishdir, forward, right, up;
+static float wishspeed;
+
+static qboolean onground;
 
 /*
 ==================
@@ -122,43 +117,37 @@ SV_UserFriction
 */
 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]);
+	float speed, newspeed, control, friction;
+	vec3_t start, stop;
+	trace_t trace;
+
+	speed = sqrt(sv_player->v->velocity[0]*sv_player->v->velocity[0]+sv_player->v->velocity[1]*sv_player->v->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] = sv_player->v->origin[0] + sv_player->v->velocity[0]/speed*16;
+	start[1] = stop[1] = sv_player->v->origin[1] + sv_player->v->velocity[1]/speed*16;
+	start[2] = sv_player->v->origin[2] + sv_player->v->mins[2];
 	stop[2] = start[2] - 34;
 
-	trace = SV_Move (start, vec3_origin, vec3_origin, stop, true, sv_player);
+	trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, sv_player);
 
 	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 - host_frametime*control*friction;
-	
+	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(sv_player->v->velocity, newspeed, sv_player->v->velocity);
 }
 
 /*
@@ -166,78 +155,87 @@ void SV_UserFriction (void)
 SV_Accelerate
 ==============
 */
-cvar_t	sv_maxspeed = {"sv_maxspeed", "320", false, true};
-cvar_t	sv_accelerate = {"sv_accelerate", "10"};
-#if 0
-void SV_Accelerate (vec3_t wishvel)
-{
-	int			i;
-	float		addspeed, accelspeed;
-	vec3_t		pushvec;
-
-	if (wishspeed == 0)
-		return;
-
-	VectorSubtract (wishvel, velocity, pushvec);
-	addspeed = VectorNormalize (pushvec);
-
-	accelspeed = sv_accelerate.value*host_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;
+	int i;
+	float addspeed, accelspeed, currentspeed;
 
-	currentspeed = DotProduct (velocity, wishdir);
+	currentspeed = DotProduct (sv_player->v->velocity, wishdir);
 	addspeed = wishspeed - currentspeed;
 	if (addspeed <= 0)
 		return;
-	accelspeed = sv_accelerate.value*host_frametime*wishspeed;
+	accelspeed = sv_accelerate.value*sv.frametime*wishspeed;
 	if (accelspeed > addspeed)
 		accelspeed = addspeed;
-	
+
 	for (i=0 ; i<3 ; i++)
-		velocity[i] += accelspeed*wishdir[i];	
+		sv_player->v->velocity[i] += accelspeed*wishdir[i];
 }
 
 void SV_AirAccelerate (vec3_t wishveloc)
 {
-	int			i;
-	float		addspeed, wishspd, accelspeed, currentspeed;
-		
+	int i;
+	float addspeed, wishspd, accelspeed, currentspeed;
+
 	wishspd = VectorNormalizeLength (wishveloc);
 	if (wishspd > 30)
 		wishspd = 30;
-	currentspeed = DotProduct (velocity, wishveloc);
+	currentspeed = DotProduct (sv_player->v->velocity, wishveloc);
 	addspeed = wishspd - currentspeed;
 	if (addspeed <= 0)
 		return;
-//	accelspeed = sv_accelerate.value * host_frametime;
-	accelspeed = sv_accelerate.value*wishspeed * host_frametime;
+	accelspeed = sv_accelerate.value*wishspeed * sv.frametime;
 	if (accelspeed > addspeed)
 		accelspeed = addspeed;
-	
+
 	for (i=0 ; i<3 ; i++)
-		velocity[i] += accelspeed*wishveloc[i];	
+		sv_player->v->velocity[i] += accelspeed*wishveloc[i];
 }
 
 
 void DropPunchAngle (void)
 {
-	float	len;
-	
-	len = VectorNormalizeLength (sv_player->v.punchangle);
-	
-	len -= 10*host_frametime;
+	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);
+	VectorScale (sv_player->v->punchangle, len, sv_player->v->punchangle);
+
+	if ((val = GETEDICTFIELDVALUE(sv_player, eval_punchvector)))
+	{
+		len = VectorNormalizeLength (val->vector);
+
+		len -= 20*sv.frametime;
+		if (len < 0)
+			len = 0;
+		VectorScale (val->vector, len, val->vector);
+	}
+}
+
+/*
+===================
+SV_FreeMove
+===================
+*/
+void SV_FreeMove (void)
+{
+	int i;
+	float wishspeed;
+
+	AngleVectors (sv_player->v->v_angle, forward, right, up);
+
+	for (i = 0; i < 3; i++)
+		sv_player->v->velocity[i] = forward[i] * cmd.forwardmove + right[i] * cmd.sidemove;
+
+	sv_player->v->velocity[2] += cmd.upmove;
+
+	wishspeed = VectorLength(sv_player->v->velocity);
+	if (wishspeed > sv_maxspeed.value)
+		VectorScale(sv_player->v->velocity, sv_maxspeed.value / wishspeed, sv_player->v->velocity);
 }
 
 /*
@@ -248,14 +246,12 @@ SV_WaterMove
 */
 void SV_WaterMove (void)
 {
-	int		i;
-	vec3_t	wishvel;
-	float	speed, newspeed, wishspeed, addspeed, accelspeed;
+	int i;
+	vec3_t wishvel;
+	float speed, newspeed, wishspeed, addspeed, accelspeed, temp;
 
-//
-// user intentions
-//
-	AngleVectors (sv_player->v.v_angle, forward, right, up);
+	// user intentions
+	AngleVectors (sv_player->v->v_angle, forward, right, up);
 
 	for (i=0 ; i<3 ; i++)
 		wishvel[i] = forward[i]*cmd.forwardmove + right[i]*cmd.sidemove;
@@ -265,31 +261,29 @@ void SV_WaterMove (void)
 	else
 		wishvel[2] += cmd.upmove;
 
-	wishspeed = Length(wishvel);
+	wishspeed = VectorLength(wishvel);
 	if (wishspeed > sv_maxspeed.value)
 	{
-		VectorScale (wishvel, sv_maxspeed.value/wishspeed, wishvel);
+		temp = sv_maxspeed.value/wishspeed;
+		VectorScale (wishvel, temp, wishvel);
 		wishspeed = sv_maxspeed.value;
 	}
 	wishspeed *= 0.7;
 
-//
-// water friction
-//
-	speed = Length (velocity);
+	// water friction
+	speed = VectorLength(sv_player->v->velocity);
 	if (speed)
 	{
-		newspeed = speed - host_frametime * speed * sv_friction.value;
+		newspeed = speed - sv.frametime * speed * sv_friction.value;
 		if (newspeed < 0)
-			newspeed = 0;	
-		VectorScale (velocity, newspeed/speed, velocity);
+			newspeed = 0;
+		temp = newspeed/speed;
+		VectorScale(sv_player->v->velocity, temp, sv_player->v->velocity);
 	}
 	else
 		newspeed = 0;
-	
-//
-// water acceleration
-//
+
+	// water acceleration
 	if (!wishspeed)
 		return;
 
@@ -298,24 +292,23 @@ void SV_WaterMove (void)
 		return;
 
 	VectorNormalize (wishvel);
-	accelspeed = sv_accelerate.value * wishspeed * host_frametime;
+	accelspeed = sv_accelerate.value * wishspeed * sv.frametime;
 	if (accelspeed > addspeed)
 		accelspeed = addspeed;
 
 	for (i=0 ; i<3 ; i++)
-		velocity[i] += accelspeed * wishvel[i];
+		sv_player->v->velocity[i] += accelspeed * wishvel[i];
 }
 
 void SV_WaterJump (void)
 {
-	if (sv.time > sv_player->v.teleport_time
-	|| !sv_player->v.waterlevel)
+	if (sv.time > sv_player->v->teleport_time || !sv_player->v->waterlevel)
 	{
-		sv_player->v.flags = (int)sv_player->v.flags & ~FL_WATERJUMP;
-		sv_player->v.teleport_time = 0;
+		sv_player->v->flags = (int)sv_player->v->flags & ~FL_WATERJUMP;
+		sv_player->v->teleport_time = 0;
 	}
-	sv_player->v.velocity[0] = sv_player->v.movedir[0];
-	sv_player->v.velocity[1] = sv_player->v.movedir[1];
+	sv_player->v->velocity[0] = sv_player->v->movedir[0];
+	sv_player->v->velocity[1] = sv_player->v->movedir[1];
 }
 
 
@@ -327,42 +320,41 @@ SV_AirMove
 */
 void SV_AirMove (void)
 {
-	int			i;
-	vec3_t		wishvel;
-	float		fmove, smove;
+	int i;
+	vec3_t wishvel;
+	float fmove, smove, temp;
 
 	// LordHavoc: correct quake movement speed bug when looking up/down
 	wishvel[0] = wishvel[2] = 0;
-	wishvel[1] = sv_player->v.angles[1];
+	wishvel[1] = sv_player->v->angles[1];
 	AngleVectors (wishvel, forward, right, up);
-//	AngleVectors (sv_player->v.angles, forward, right, up);
 
 	fmove = cmd.forwardmove;
 	smove = cmd.sidemove;
-	
+
 // hack to not let you back into teleporter
-	if (sv.time < sv_player->v.teleport_time && fmove < 0)
+	if (sv.time < sv_player->v->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)sv_player->v->movetype != MOVETYPE_WALK)
+		wishvel[2] += cmd.upmove;
 
 	VectorCopy (wishvel, wishdir);
 	wishspeed = VectorNormalizeLength(wishdir);
 	if (wishspeed > sv_maxspeed.value)
 	{
-		VectorScale (wishvel, sv_maxspeed.value/wishspeed, wishvel);
+		temp = sv_maxspeed.value/wishspeed;
+		VectorScale (wishvel, temp, wishvel);
 		wishspeed = sv_maxspeed.value;
 	}
-	
-	if ( sv_player->v.movetype == MOVETYPE_NOCLIP)
-	{	// noclip
-		VectorCopy (wishvel, velocity);
+
+	if (sv_player->v->movetype == MOVETYPE_NOCLIP)
+	{
+		// noclip
+		VectorCopy (wishvel, sv_player->v->velocity);
 	}
 	else if ( onground )
 	{
@@ -370,9 +362,10 @@ void SV_AirMove (void)
 		SV_Accelerate ();
 	}
 	else
-	{	// not on ground, so little effect on velocity
+	{
+		// not on ground, so little effect on velocity
 		SV_AirAccelerate (wishvel);
-	}		
+	}
 }
 
 /*
@@ -385,60 +378,226 @@ the angle fields specify an exact angular motion in degrees
 */
 void SV_ClientThink (void)
 {
-	vec3_t		v_angle;
+	vec3_t v_angle;
 
-	if (sv_player->v.movetype == MOVETYPE_NONE)
+	if (sv_player->v->movetype == MOVETYPE_NONE)
 		return;
-	
-	onground = (int)sv_player->v.flags & FL_ONGROUND;
 
-	origin = sv_player->v.origin;
-	velocity = sv_player->v.velocity;
+	onground = (int)sv_player->v->flags & FL_ONGROUND;
 
 	DropPunchAngle ();
-	
-//
-// if dead, behave differently
-//
-	if (sv_player->v.health <= 0)
+
+	// if dead, behave differently
+	if (sv_player->v->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)
+
+	// angles
+	// show 1/3 the pitch angle and all the roll angle
+	VectorAdd (sv_player->v->v_angle, sv_player->v->punchangle, v_angle);
+	sv_player->v->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];
+		sv_player->v->angles[PITCH] = -v_angle[PITCH]/3;
+		sv_player->v->angles[YAW] = v_angle[YAW];
 	}
 
-	if ( (int)sv_player->v.flags & FL_WATERJUMP )
+	if ( (int)sv_player->v->flags & FL_WATERJUMP )
 	{
 		SV_WaterJump ();
 		return;
 	}
-//
-// walk
-//
-	if ( (sv_player->v.waterlevel >= 2)
-	&& (sv_player->v.movetype != MOVETYPE_NOCLIP) )
+
+	/*
+	// Player is (somehow) outside of the map, or flying, or noclipping
+	if (sv_player->v->movetype != MOVETYPE_NOCLIP && (sv_player->v->movetype == MOVETYPE_FLY || SV_TestEntityPosition (sv_player)))
+	//if (sv_player->v->movetype == MOVETYPE_NOCLIP || sv_player->v->movetype == MOVETYPE_FLY || SV_TestEntityPosition (sv_player))
+	{
+		SV_FreeMove ();
+		return;
+	}
+	*/
+
+	// walk
+	if ((sv_player->v->waterlevel >= 2) && (sv_player->v->movetype != MOVETYPE_NOCLIP))
 	{
 		SV_WaterMove ();
 		return;
 	}
 
-	SV_AirMove ();	
+	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 (sv_player->v->movetype == MOVETYPE_NONE)
+		return;
+
+	f = DotProduct(sv_player->v->punchangle, sv_player->v->punchangle);
+	if (f)
+	{
+		limit = sqrt(f);
+		f = (limit - 10 * sv.frametime);
+		f /= limit;
+		f = max(0, f);
+		VectorScale(sv_player->v->punchangle, f, sv_player->v->punchangle);
+	}
+
+	// if dead, behave differently
+	if (sv_player->v->health <= 0)
+		return;
+
+	AngleVectors(sv_player->v->v_angle, v_forward, v_right, v_up);
+	// show 1/3 the pitch angle and all the roll angle
+	f = DotProduct(sv_player->v->velocity, v_right) * (1.0 / cl_rollspeed.value);
+	sv_player->v->angles[2] = bound(-1, f, 1) * cl_rollangle.value * 4;
+	if (!sv_player->v->fixangle)
+	{
+		sv_player->v->angles[0] = (sv_player->v->v_angle[0] + sv_player->v->punchangle[0]) * -0.333;
+		sv_player->v->angles[1] = sv_player->v->v_angle[1] + sv_player->v->punchangle[1];
+	}
+
+	if ((int)sv_player->v->flags & FL_WATERJUMP)
+	{
+		sv_player->v->velocity[0] = sv_player->v->movedir[0];
+		sv_player->v->velocity[1] = sv_player->v->movedir[1];
+		if (sv.time > sv_player->v->teleport_time || sv_player->v->waterlevel == 0)
+		{
+			sv_player->v->flags = (int)sv_player->v->flags - ((int)sv_player->v->flags & FL_WATERJUMP);
+			sv_player->v->teleport_time = 0;
+		}
+		return;
+	}
+
+	// swim
+	if (sv_player->v->waterlevel >= 2)
+	if (sv_player->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(sv_player->v->velocity) * (1 - sv.frametime * sv_friction.value);
+		if (f > 0)
+			f /= VectorLength(sv_player->v->velocity);
+		else
+			f = 0;
+		VectorScale(sv_player->v->velocity, f, sv_player->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(sv_player->v->velocity, f, wishvel, sv_player->v->velocity);
+		return;
+	}
+
+	// if not flying, move horizontally only
+	if (sv_player->v->movetype != MOVETYPE_FLY)
+	{
+		VectorClear(wishvel);
+		wishvel[1] = sv_player->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 >= sv_player->v->teleport_time || host_client->cmd.forwardmove > 0)
+		VectorMA(wishvel, host_client->cmd.forwardmove, v_forward, wishvel);
+	if (sv_player->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 (sv_player->v->movetype == MOVETYPE_NOCLIP || sv_player->v->movetype == MOVETYPE_FLY)
+	{
+		VectorScale(wishdir, wishspeed, sv_player->v->velocity);
+		return;
+	}
+
+	if ((int)sv_player->v->flags & FL_ONGROUND) // walking
+	{
+		// friction
+		f = sv_player->v->velocity[0] * sv_player->v->velocity[0] + sv_player->v->velocity[1] * sv_player->v->velocity[1];
+		if (f)
+		{
+			f = sqrt(f);
+			VectorCopy(sv_player->v->velocity, v);
+			v[2] = 0;
+
+			// if the leading edge is over a dropoff, increase friction
+			limit = 16.0f / f;
+			VectorMA(sv_player->v->origin, limit, v, v);
+			v[2] += sv_player->v->mins[2];
+
+			VectorCopy(v, start);
+			VectorCopy(v, stop);
+			stop[2] -= 34;
+			trace = SV_Move(start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, sv_player);
+
+			// 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(sv_player->v->velocity, f, sv_player->v->velocity);
+		}
+	}
+	else // airborn
+		wishspeed = min(wishspeed, 30);
+
+	// ground or air acceleration
+	f = wishspeed - DotProduct(sv_player->v->velocity, wishdir);
+	if (f > 0)
+	{
+		limit = sv_accelerate.value * sv.frametime * wishspeed;
+		if (f > limit)
+			f = limit;
+		VectorMA(sv_player->v->velocity, f, wishdir, sv_player->v->velocity);
+	}
+}
+#endif
 
 /*
 ===================
@@ -447,213 +606,219 @@ SV_ReadClientMove
 */
 void SV_ReadClientMove (usercmd_t *move)
 {
-	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 ();
+	int i;
+	vec3_t angle;
+	int bits;
+	eval_t *val;
+	float total;
+
+	// 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 ();
+	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 	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.value && (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)))
+	// can be used for prediction
+	host_client->ping = total / NUM_PING_TIMES;
+	if ((val = GETEDICTFIELDVALUE(sv_player, eval_ping)))
 		val->_float = host_client->ping * 1000.0;
 
-// read current angles
-	if (dpprotocol)
+	// read current angles
+	for (i = 0;i < 3;i++)
 	{
-		for (i=0 ; i<3 ; i++)
-			angle[i] = MSG_ReadPreciseAngle ();
-	}
-	else
-	{
-		for (i=0 ; i<3 ; i++)
-			angle[i] = MSG_ReadAngle ();
+		if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+		if (sv.protocol == PROTOCOL_QUAKE)
+			angle[i] = MSG_ReadAngle8i();
+		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)
+			angle[i] = MSG_ReadAngle16i();
+		if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 	}
 
-	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)))
+	VectorCopy (angle, sv_player->v->v_angle);
+
+	// 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(sv_player, eval_movement)))
 	{
 		val->vector[0] = move->forwardmove;
 		val->vector[1] = move->sidemove;
 		val->vector[2] = move->upmove;
 	}
-	
-// read buttons
+
+	// read buttons
 	bits = MSG_ReadByte ();
-	host_client->edict->v.button0 = bits & 1;
-	host_client->edict->v.button2 = (bits & 2)>>1;
+	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
+	sv_player->v->button0 = bits & 1;
+	sv_player->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(sv_player, eval_button3))) val->_float = ((bits >> 2) & 1);
+	if ((val = GETEDICTFIELDVALUE(sv_player, eval_button4))) val->_float = ((bits >> 3) & 1);
+	if ((val = GETEDICTFIELDVALUE(sv_player, eval_button5))) val->_float = ((bits >> 4) & 1);
+	if ((val = GETEDICTFIELDVALUE(sv_player, eval_button6))) val->_float = ((bits >> 5) & 1);
+	if ((val = GETEDICTFIELDVALUE(sv_player, eval_button7))) val->_float = ((bits >> 6) & 1);
+	if ((val = GETEDICTFIELDVALUE(sv_player, eval_button8))) val->_float = ((bits >> 7) & 1);
 
 	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;
+		sv_player->v->impulse = i;
 }
 
 /*
 ===================
 SV_ReadClientMessage
-
-Returns false if the client should be killed
 ===================
 */
-qboolean SV_ReadClientMessage (void)
+extern void SV_SendServerinfo(client_t *client);
+void SV_ReadClientMessage(void)
 {
-	int		ret;
-	int		cmd;
-	char		*s;
-	
-	do
+	int cmd, num;
+	char *s;
+
+	//MSG_BeginReading ();
+
+	for(;;)
 	{
-nextmsg:
-		ret = NET_GetMessage (host_client->netconnection);
-		if (ret == -1)
+		if (!host_client->active)
 		{
-			Sys_Printf ("SV_ReadClientMessage: NET_GetMessage failed\n");
-			return false;
+			// a command caused an error
+			SV_DropClient (false);
+			return;
 		}
-		if (!ret)
-			return true;
-					
-		MSG_BeginReading ();
-		
-		while (1)
+
+		if (msg_badread)
 		{
-			if (!host_client->active)
-				return false;	// a command caused an error
+			Con_Print("SV_ReadClientMessage: badread\n");
+			SV_DropClient (false);
+			return;
+		}
 
-			if (msg_badread)
-			{
-				Sys_Printf ("SV_ReadClientMessage: badread\n");
-				return false;
-			}	
-	
-			cmd = MSG_ReadChar ();
-			
-			switch (cmd)
+		cmd = MSG_ReadChar ();
+		if (cmd == -1)
+		{
+			// end of message
+			break;
+		}
+
+		switch (cmd)
+		{
+		default:
+			Con_Printf("SV_ReadClientMessage: unknown command char %i\n", cmd);
+			SV_DropClient (false);
+			return;
+
+		case clc_nop:
+			break;
+
+		case clc_stringcmd:
+			s = MSG_ReadString ();
+			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)
 			{
-			case -1:
-				goto nextmsg;		// end of message
-				
-			default:
-				Sys_Printf ("SV_ReadClientMessage: unknown command char\n");
-				return false;
-							
-			case clc_nop:
-//				Sys_Printf ("clc_nop\n");
-				break;
-				
-			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
-				 || (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))
-				 || (!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)))
-				{
-					ret = 1;
-					Cmd_ExecuteString (s, src_client);
-				}
-				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;
-				
-			case clc_disconnect:
-//				Sys_Printf ("SV_ReadClientMessage: client disconnected\n");
-				return false;
-			
-			case clc_move:
-				SV_ReadClientMove (&host_client->cmd);
-				break;
+				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), "");
 			}
+			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
+			 || (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);
+			break;
+
+		case clc_disconnect:
+			SV_DropClient (false); // client wants to disconnect
+			return;
+
+		case clc_move:
+			SV_ReadClientMove (&host_client->cmd);
+			break;
+
+		case clc_ackentities:
+			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)
+				Con_Printf("recv clc_ackentities %i\n", num);
+			if (host_client->entitydatabase)
+				EntityFrame_AckFrame(host_client->entitydatabase, num);
+			else if (host_client->entitydatabase4)
+				EntityFrame4_AckFrame(host_client->entitydatabase4, host_client->entitydatabase4->ackframenum, true);
+			else if (host_client->entitydatabase5)
+				EntityFrame5_AckFrame(host_client->entitydatabase5, num, host_client - svs.clients + 1);
+			break;
 		}
-	} while (ret == 1);
-	
-	return true;
+	}
 }
 
-
 /*
 ==================
 SV_RunClients
 ==================
 */
-extern dfunction_t *SV_PlayerPhysicsQC;
 void SV_RunClients (void)
 {
-	int				i;
+	int i;
 
-	for (i=0, host_client = svs.clients ; i<svs.maxclients ; i++, host_client++)
+	for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
 	{
 		if (!host_client->active)
 			continue;
-	
-		sv_player = host_client->edict;
-
-		if (!SV_ReadClientMessage ())
-		{
-			SV_DropClient (false);	// client misbehaved...
-			continue;
-		}
 
 		if (!host_client->spawned)
 		{
-		// clear client movement until a new packet is received
+			// clear client movement until a new packet is received
 			memset (&host_client->cmd, 0, sizeof(host_client->cmd));
 			continue;
 		}
 
-// always pause in single player if in console or menus
-		if (!sv.paused && (svs.maxclients > 1 || key_dest == key_game) )
+		if (sv.frametime)
 		{
+			sv_player = host_client->edict;
+
 			// LordHavoc: QuakeC replacement for SV_ClientThink (player movement)
 			if (SV_PlayerPhysicsQC)
 			{
 				pr_global_struct->time = sv.time;
 				pr_global_struct->self = EDICT_TO_PROG(sv_player);
-				PR_ExecuteProgram ((func_t)(SV_PlayerPhysicsQC - pr_functions));
+				PR_ExecuteProgram ((func_t)(SV_PlayerPhysicsQC - pr_functions), "");
 			}
 			else
 				SV_ClientThink ();
+
+			SV_CheckVelocity(sv_player);
+
+			// 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(sv_player->v->velocity, sv_player->v->velocity) < 0.0001)
+				VectorClear(sv_player->v->velocity);
 		}
 	}
 }