#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"};
static usercmd_t cmd;
int i, j;
int step, dir, 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];
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
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);
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);
}
/*
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;
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)
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 = 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);
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);
}
/*
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;
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;
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];
}
// 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);
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 )
{
{
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;
/*
// 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;
*/
// 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;
float wishspeed, f, limit;
trace_t trace;
- if (host_client->edict->v->movetype == MOVETYPE_NONE)
+ if (host_client->edict->fields.server->movetype == MOVETYPE_NONE)
return;
- f = DotProduct(host_client->edict->v->punchangle, host_client->edict->v->punchangle);
+ f = DotProduct(host_client->edict->fields.server->punchangle, host_client->edict->fields.server->punchangle);
if (f)
{
limit = sqrt(f);
f = (limit - 10 * sv.frametime);
f /= limit;
f = max(0, f);
- VectorScale(host_client->edict->v->punchangle, f, host_client->edict->v->punchangle);
+ VectorScale(host_client->edict->fields.server->punchangle, f, host_client->edict->fields.server->punchangle);
}
// if dead, behave differently
- if (host_client->edict->v->health <= 0)
+ if (host_client->edict->fields.server->health <= 0)
return;
- AngleVectors(host_client->edict->v->v_angle, v_forward, v_right, v_up);
+ AngleVectors(host_client->edict->fields.server->v_angle, v_forward, v_right, v_up);
// show 1/3 the pitch angle and all the roll angle
- f = DotProduct(host_client->edict->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)
+ f = DotProduct(host_client->edict->fields.server->velocity, v_right) * (1.0 / cl_rollspeed.value);
+ host_client->edict->fields.server->angles[2] = bound(-1, f, 1) * cl_rollangle.value * 4;
+ if (!host_client->edict->fields.server->fixangle)
{
- host_client->edict->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];
+ host_client->edict->fields.server->angles[0] = (host_client->edict->fields.server->v_angle[0] + host_client->edict->fields.server->punchangle[0]) * -0.333;
+ host_client->edict->fields.server->angles[1] = host_client->edict->fields.server->v_angle[1] + host_client->edict->fields.server->punchangle[1];
}
- if ((int)host_client->edict->v->flags & FL_WATERJUMP)
+ if ((int)host_client->edict->fields.server->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->fields.server->velocity[0] = host_client->edict->fields.server->movedir[0];
+ host_client->edict->fields.server->velocity[1] = host_client->edict->fields.server->movedir[1];
+ if (sv.time > host_client->edict->fields.server->teleport_time || host_client->edict->fields.server->waterlevel == 0)
{
- host_client->edict->v->flags = (int)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 - ((int)host_client->edict->fields.server->flags & FL_WATERJUMP);
+ host_client->edict->fields.server->teleport_time = 0;
}
return;
}
// swim
- if (host_client->edict->v->waterlevel >= 2)
- if (host_client->edict->v->movetype != MOVETYPE_NOCLIP)
+ if (host_client->edict->fields.server->waterlevel >= 2)
+ if (host_client->edict->fields.server->movetype != MOVETYPE_NOCLIP)
{
if (host_client->cmd.forwardmove == 0 && host_client->cmd.sidemove == 0 && host_client->cmd.upmove == 0)
{
wishspeed = min(wishspeed, sv_maxspeed.value) * 0.7;
// water friction
- f = VectorLength(host_client->edict->v->velocity) * (1 - sv.frametime * sv_friction.value);
+ f = VectorLength(host_client->edict->fields.server->velocity) * (1 - sv.frametime * sv_friction.value);
if (f > 0)
- f /= VectorLength(host_client->edict->v->velocity);
+ f /= VectorLength(host_client->edict->fields.server->velocity);
else
f = 0;
- VectorScale(host_client->edict->v->velocity, f, host_client->edict->v->velocity);
+ VectorScale(host_client->edict->fields.server->velocity, f, host_client->edict->fields.server->velocity);
// water acceleration
if (wishspeed <= f)
limit = VectorLength(wishvel);
if (limit)
f /= limit;
- VectorMA(host_client->edict->v->velocity, f, wishvel, host_client->edict->v->velocity);
+ VectorMA(host_client->edict->fields.server->velocity, f, wishvel, host_client->edict->fields.server->velocity);
return;
}
// if not flying, move horizontally only
- if (host_client->edict->v->movetype != MOVETYPE_FLY)
+ if (host_client->edict->fields.server->movetype != MOVETYPE_FLY)
{
VectorClear(wishvel);
- wishvel[1] = host_client->edict->v->v_angle[1];
+ wishvel[1] = host_client->edict->fields.server->v_angle[1];
AngleVectors(wishvel, v_forward, v_right, v_up);
}
// hack to not let you back into teleporter
VectorScale(v_right, host_client->cmd.sidemove, wishvel);
- if (sv.time >= host_client->edict->v->teleport_time || host_client->cmd.forwardmove > 0)
+ if (sv.time >= host_client->edict->fields.server->teleport_time || host_client->cmd.forwardmove > 0)
VectorMA(wishvel, host_client->cmd.forwardmove, v_forward, wishvel);
- if (host_client->edict->v->movetype != MOVETYPE_WALK)
+ if (host_client->edict->fields.server->movetype != MOVETYPE_WALK)
wishvel[2] += cmd.upmove;
VectorCopy(wishvel, wishdir);
if (wishspeed > sv_maxspeed.value)
wishspeed = sv_maxspeed.value;
- if (host_client->edict->v->movetype == MOVETYPE_NOCLIP || host_client->edict->v->movetype == MOVETYPE_FLY)
+ if (host_client->edict->fields.server->movetype == MOVETYPE_NOCLIP || host_client->edict->fields.server->movetype == MOVETYPE_FLY)
{
- VectorScale(wishdir, wishspeed, host_client->edict->v->velocity);
+ VectorScale(wishdir, wishspeed, host_client->edict->fields.server->velocity);
return;
}
- if ((int)host_client->edict->v->flags & FL_ONGROUND) // walking
+ if ((int)host_client->edict->fields.server->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];
+ f = host_client->edict->fields.server->velocity[0] * host_client->edict->fields.server->velocity[0] + host_client->edict->fields.server->velocity[1] * host_client->edict->fields.server->velocity[1];
if (f)
{
f = sqrt(f);
- VectorCopy(host_client->edict->v->velocity, v);
+ VectorCopy(host_client->edict->fields.server->velocity, v);
v[2] = 0;
// if the leading edge is over a dropoff, increase friction
limit = 16.0f / f;
- VectorMA(host_client->edict->v->origin, limit, v, v);
- v[2] += host_client->edict->v->mins[2];
+ VectorMA(host_client->edict->fields.server->origin, limit, v, v);
+ v[2] += host_client->edict->fields.server->mins[2];
VectorCopy(v, start);
VectorCopy(v, stop);
if (f < 0)
f = 0;
- VectorScale(host_client->edict->v->velocity, f, host_client->edict->v->velocity);
+ VectorScale(host_client->edict->fields.server->velocity, f, host_client->edict->fields.server->velocity);
}
}
else // airborn
wishspeed = min(wishspeed, 30);
// ground or air acceleration
- f = wishspeed - DotProduct(host_client->edict->v->velocity, wishdir);
+ f = wishspeed - DotProduct(host_client->edict->fields.server->velocity, wishdir);
if (f > 0)
{
limit = sv_accelerate.value * sv.frametime * wishspeed;
if (f > limit)
f = limit;
- VectorMA(host_client->edict->v->velocity, f, wishdir, host_client->edict->v->velocity);
+ VectorMA(host_client->edict->fields.server->velocity, f, wishdir, host_client->edict->fields.server->velocity);
}
}
#endif
SV_ReadClientMove
===================
*/
-extern void SV_Physics_Entity (edict_t *ent, qboolean runmove);
-void SV_ReadClientMove (void)
+qboolean SV_ReadClientMove (void)
{
+ qboolean kickplayer = false;
int i;
double oldmovetime;
usercmd_t *move = &host_client->cmd;
oldmovetime = move->time;
- memset(move, 0, sizeof(usercmd_t));
+
+ // if this move has been applied, clear it, and start accumulating new data
+ if (move->applied)
+ memset(move, 0, sizeof(*move));
if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
if (msg_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_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
- move->buttons = MSG_ReadByte ();
+ move->buttons |= MSG_ReadByte ();
else
- move->buttons = MSG_ReadLong ();
+ move->buttons |= MSG_ReadLong ();
if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
// read impulse
move->cursor_impact[1] = MSG_ReadFloat();
move->cursor_impact[2] = MSG_ReadFloat();
move->cursor_entitynumber = (unsigned short)MSG_ReadShort();
- if (move->cursor_entitynumber >= sv.max_edicts)
+ 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->free)
+ 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 (!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 = move->time - oldmovetime;
- double oldframetime = pr_global_struct->frametime;
- if (frametime > 0.1)
- frametime = 0.1;
- pr_global_struct->frametime = frametime;
- SV_Physics_Entity(host_client->edict, true);
- pr_global_struct->frametime = oldframetime;
+ 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)
{
+#ifdef NUM_PING_TIMES
int i;
- eval_t *val;
float total;
+#endif
+ prvm_eval_t *val;
usercmd_t *move = &host_client->cmd;
+ if (!move->receivetime || move->applied)
+ return;
+
+ move->applied = true;
+
// 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];
host_client->ping = total / NUM_PING_TIMES;
+#endif
// set the edict fields
- host_client->edict->v->button0 = move->buttons & 1;
- host_client->edict->v->button2 = (move->buttons & 2)>>1;
- host_client->edict->v->impulse = move->impulse;
- VectorCopy(move->viewangles, host_client->edict->v->v_angle);
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button3))) val->_float = ((move->buttons >> 2) & 1);
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button4))) val->_float = ((move->buttons >> 3) & 1);
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button5))) val->_float = ((move->buttons >> 4) & 1);
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button6))) val->_float = ((move->buttons >> 5) & 1);
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button7))) val->_float = ((move->buttons >> 6) & 1);
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_button8))) val->_float = ((move->buttons >> 7) & 1);
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_buttonuse))) val->_float = ((move->buttons >> 8) & 1);
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_buttonchat))) val->_float = ((move->buttons >> 9) & 1);
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_cursor_active))) val->_float = ((move->buttons >> 10) & 1);
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_movement))) VectorSet(val->vector, move->forwardmove, move->sidemove, move->upmove);
- 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 ((val = GETEDICTFIELDVALUE(host_client->edict, eval_ping))) val->_float = host_client->ping * 1000.0;
+ 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;
+ 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)
return;
}
- cmd = MSG_ReadChar ();
+ cmd = MSG_ReadByte ();
if (cmd == -1)
{
// end of message
Cmd_ExecuteString (s, src_client);
else if (SV_ParseClientCommandQC)
{
- G_INT(OFS_PARM0) = PR_SetEngineString(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
return;
case clc_move:
- SV_ReadClientMove ();
+ // if ReadClientMove returns true, the client tried to speed cheat
+ if (SV_ReadClientMove ())
+ SV_DropClient (false);
break;
case clc_ackframe:
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++)
projects / xonotic / darkplaces.git / blobdiff