X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_user.c;h=480c46a630ca853340bee51d33bf36f8f6819ff0;hb=de23df173b998d21ae0f5155962cbf2ca650670c;hp=6566bf3e2bd5c16e05392d244ff437165653c908;hpb=c601878023c4b57a02391e30db730a200402bfe1;p=xonotic%2Fdarkplaces.git diff --git a/sv_user.c b/sv_user.c index 6566bf3e..480c46a6 100644 --- a/sv_user.c +++ b/sv_user.c @@ -21,11 +21,17 @@ 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"}; +cvar_t sv_clmovement_enable = {0, "sv_clmovement_enable", "1", "whether to allow clients to use cl_movement prediction, which can cause choppy movement on the server which may annoy other players"}; +cvar_t sv_clmovement_minping = {0, "sv_clmovement_minping", "100", "if client ping is below this time in milliseconds, then their ability to use cl_movement prediction is disabled for a while (as they don't need it)"}; +cvar_t sv_clmovement_minping_disabletime = {0, "sv_clmovement_minping_disabletime", "1000", "when client falls below minping, disable their prediction for this many milliseconds (should be at least 1000 or else their prediction may turn on/off frequently)"}; +cvar_t sv_clmovement_waitforinput = {0, "sv_clmovement_waitforinput", "2", "when a client does not send input for this many frames, force them to move anyway (unlike QuakeWorld)"}; static usercmd_t cmd; @@ -38,12 +44,12 @@ SV_SetIdealPitch #define MAX_FORWARD 6 void SV_SetIdealPitch (void) { - float angleval, sinval, cosval; + float angleval, sinval, cosval, step, dir; trace_t tr; vec3_t top, bottom; float z[MAX_FORWARD]; int i, j; - int step, dir, steps; + int steps; if (!((int)host_client->edict->fields.server->flags & FL_ONGROUND)) return; @@ -101,7 +107,6 @@ void SV_SetIdealPitch (void) host_client->edict->fields.server->idealpitch = -dir * sv_idealpitchscale.value; } -#if 1 static vec3_t wishdir, forward, right, up; static float wishspeed; @@ -176,13 +181,13 @@ void SV_AirAccelerate (vec3_t wishveloc) float addspeed, wishspd, accelspeed, currentspeed; wishspd = VectorNormalizeLength (wishveloc); - if (wishspd > 30) - wishspd = 30; + if (wishspd > sv_maxairspeed.value) + wishspd = sv_maxairspeed.value; currentspeed = DotProduct (host_client->edict->fields.server->velocity, wishveloc); addspeed = wishspd - currentspeed; if (addspeed <= 0) return; - accelspeed = sv_accelerate.value*wishspeed * sv.frametime; + accelspeed = (sv_airaccelerate.value < 0 ? sv_accelerate.value : sv_airaccelerate.value)*wishspeed * sv.frametime; if (accelspeed > addspeed) accelspeed = addspeed; @@ -272,7 +277,7 @@ void SV_WaterMove (void) speed = VectorLength(host_client->edict->fields.server->velocity); if (speed) { - newspeed = speed - sv.frametime * speed * sv_friction.value; + newspeed = speed - sv.frametime * speed * sv_waterfriction.value; if (newspeed < 0) newspeed = 0; temp = newspeed/speed; @@ -290,7 +295,7 @@ void SV_WaterMove (void) return; VectorNormalize (wishvel); - accelspeed = sv_accelerate.value * wishspeed * sv.frametime; + accelspeed = (sv_wateraccelerate.value < 0 ? sv_accelerate.value : sv_wateraccelerate.value) * wishspeed * sv.frametime; if (accelspeed > addspeed) accelspeed = addspeed; @@ -354,7 +359,7 @@ void SV_AirMove (void) // noclip VectorCopy (wishvel, host_client->edict->fields.server->velocity); } - else if ( onground ) + else if (onground && (!sv_gameplayfix_qwplayerphysics.integer || !(host_client->edict->fields.server->button2 || !((int)host_client->edict->fields.server->flags & FL_JUMPRELEASED)))) { SV_UserFriction (); SV_Accelerate (); @@ -427,190 +432,26 @@ 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->fields.server->movetype == MOVETYPE_NONE) - return; - - f = DotProduct(host_client->edict->fields.server->punchangle, host_client->edict->fields.server->punchangle); - if (f) - { - limit = sqrt(f); - f = (limit - 10 * sv.frametime); - f /= limit; - f = max(0, f); - VectorScale(host_client->edict->fields.server->punchangle, f, host_client->edict->fields.server->punchangle); - } - - // if dead, behave differently - if (host_client->edict->fields.server->health <= 0) - return; - - AngleVectors(host_client->edict->fields.server->v_angle, v_forward, v_right, v_up); - // show 1/3 the pitch angle and all the roll angle - f = DotProduct(host_client->edict->fields.server->velocity, v_right) * (1.0 / cl_rollspeed.value); - host_client->edict->fields.server->angles[2] = bound(-1, f, 1) * cl_rollangle.value * 4; - if (!host_client->edict->fields.server->fixangle) - { - host_client->edict->fields.server->angles[0] = (host_client->edict->fields.server->v_angle[0] + host_client->edict->fields.server->punchangle[0]) * -0.333; - host_client->edict->fields.server->angles[1] = host_client->edict->fields.server->v_angle[1] + host_client->edict->fields.server->punchangle[1]; - } - - if ((int)host_client->edict->fields.server->flags & FL_WATERJUMP) - { - host_client->edict->fields.server->velocity[0] = host_client->edict->fields.server->movedir[0]; - host_client->edict->fields.server->velocity[1] = host_client->edict->fields.server->movedir[1]; - if (sv.time > host_client->edict->fields.server->teleport_time || host_client->edict->fields.server->waterlevel == 0) - { - host_client->edict->fields.server->flags = (int)host_client->edict->fields.server->flags - ((int)host_client->edict->fields.server->flags & FL_WATERJUMP); - host_client->edict->fields.server->teleport_time = 0; - } - return; - } - - // swim - if (host_client->edict->fields.server->waterlevel >= 2) - if (host_client->edict->fields.server->movetype != MOVETYPE_NOCLIP) - { - if (host_client->cmd.forwardmove == 0 && host_client->cmd.sidemove == 0 && host_client->cmd.upmove == 0) - { - // drift towards bottom - wishvel[0] = 0; - wishvel[1] = 0; - wishvel[2] = -60; - } - else - { - for (j = 0;j < 3;j++) - wishvel[j] = v_forward[j] * host_client->cmd.forwardmove + v_right[j] * host_client->cmd.sidemove; - wishvel[2] += host_client->cmd.upmove; - } - - wishspeed = VectorLength(wishvel); - wishspeed = min(wishspeed, sv_maxspeed.value) * 0.7; - - // water friction - f = VectorLength(host_client->edict->fields.server->velocity) * (1 - sv.frametime * sv_friction.value); - if (f > 0) - f /= VectorLength(host_client->edict->fields.server->velocity); - else - f = 0; - VectorScale(host_client->edict->fields.server->velocity, f, host_client->edict->fields.server->velocity); - - // water acceleration - if (wishspeed <= f) - return; - - f = wishspeed - f; - limit = sv_accelerate.value * wishspeed * sv.frametime; - if (f > limit) - f = limit; - limit = VectorLength(wishvel); - if (limit) - f /= limit; - VectorMA(host_client->edict->fields.server->velocity, f, wishvel, host_client->edict->fields.server->velocity); - return; - } - - // if not flying, move horizontally only - if (host_client->edict->fields.server->movetype != MOVETYPE_FLY) - { - VectorClear(wishvel); - wishvel[1] = host_client->edict->fields.server->v_angle[1]; - AngleVectors(wishvel, v_forward, v_right, v_up); - } - - // hack to not let you back into teleporter - VectorScale(v_right, host_client->cmd.sidemove, wishvel); - if (sv.time >= host_client->edict->fields.server->teleport_time || host_client->cmd.forwardmove > 0) - VectorMA(wishvel, host_client->cmd.forwardmove, v_forward, wishvel); - if (host_client->edict->fields.server->movetype != MOVETYPE_WALK) - wishvel[2] += cmd.upmove; - - VectorCopy(wishvel, wishdir); - VectorNormalize(wishdir); - wishspeed = VectorLength(wishvel); - if (wishspeed > sv_maxspeed.value) - wishspeed = sv_maxspeed.value; - - if (host_client->edict->fields.server->movetype == MOVETYPE_NOCLIP || host_client->edict->fields.server->movetype == MOVETYPE_FLY) - { - VectorScale(wishdir, wishspeed, host_client->edict->fields.server->velocity); - return; - } - - if ((int)host_client->edict->fields.server->flags & FL_ONGROUND) // walking - { - // friction - f = host_client->edict->fields.server->velocity[0] * host_client->edict->fields.server->velocity[0] + host_client->edict->fields.server->velocity[1] * host_client->edict->fields.server->velocity[1]; - if (f) - { - f = sqrt(f); - VectorCopy(host_client->edict->fields.server->velocity, v); - v[2] = 0; - - // if the leading edge is over a dropoff, increase friction - limit = 16.0f / f; - VectorMA(host_client->edict->fields.server->origin, limit, v, v); - v[2] += host_client->edict->fields.server->mins[2]; - - VectorCopy(v, start); - VectorCopy(v, stop); - stop[2] -= 34; - trace = SV_Move(start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, host_client->edict); - - // apply friction - if (f < sv_stopspeed.value) - f = sv_stopspeed.value / f; - else - f = 1; - if (trace.fraction == 1) - f *= sv_edgefriction.value; - f = 1 - sv.frametime * f * sv_friction.value; - - if (f < 0) - f = 0; - VectorScale(host_client->edict->fields.server->velocity, f, host_client->edict->fields.server->velocity); - } - } - else // airborn - wishspeed = min(wishspeed, 30); - - // ground or air acceleration - f = wishspeed - DotProduct(host_client->edict->fields.server->velocity, wishdir); - if (f > 0) - { - limit = sv_accelerate.value * sv.frametime * wishspeed; - if (f > limit) - f = limit; - VectorMA(host_client->edict->fields.server->velocity, f, wishdir, host_client->edict->fields.server->velocity); - } -} -#endif - /* =================== SV_ReadClientMove =================== */ -extern void SV_Physics_Entity (prvm_edict_t *ent, qboolean runmove); -void SV_ReadClientMove (void) +qboolean SV_ReadClientMove (void) { + qboolean kickplayer = false; int i; double oldmovetime; +#ifdef NUM_PING_TIMES + double total; +#endif 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__); @@ -621,6 +462,16 @@ void SV_ReadClientMove (void) 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]; + host_client->ping = total / NUM_PING_TIMES; +#endif + // read current angles for (i = 0;i < 3;i++) { @@ -642,14 +493,18 @@ void SV_ReadClientMove (void) 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->impulse = MSG_ReadByte (); + i = MSG_ReadByte (); + if (i) + move->impulse = i; if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__); // PRYDON_CLIENTCURSOR @@ -677,43 +532,66 @@ void SV_ReadClientMove (void) if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__); } + // disable clientside movement prediction in some cases + if (ceil((move->receivetime - move->time) * 1000.0) < sv_clmovement_minping.integer) + host_client->clmovement_disabletimeout = realtime + sv_clmovement_minping_disabletime.value / 1000.0; + if (!sv_clmovement_enable.integer || host_client->clmovement_disabletimeout > realtime) + move->sequence = 0; + if (!host_client->spawned) memset(move, 0, sizeof(*move)); + else if (move->sequence && (float)move->time > (float)sv.time + 0.125f) // add a little fuzz factor due to float precision issues + { + Con_DPrintf("client move->time %f > sv.time %f, kicking\n", (float)move->time, (float)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) + if (host_client->movesequence && sv_clmovement_waitforinput.integer > 0) { - double frametime = move->time - oldmovetime; + double frametime = bound(0, move->time - oldmovetime, 0.1); double oldframetime = prog->globals.server->frametime; - if (frametime > 0.1) - frametime = 0.1; + //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_Entity(host_client->edict, true); + SV_Physics_ClientEntity(host_client->edict); prog->globals.server->frametime = oldframetime; + host_client->clmovement_skipphysicsframes = sv_clmovement_waitforinput.integer; } } + return kickplayer; } void SV_ApplyClientMove (void) { - int i; prvm_eval_t *val; - float total; usercmd_t *move = &host_client->cmd; - // calculate average ping time - 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; + 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); @@ -721,6 +599,14 @@ void SV_ApplyClientMove (void) 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); @@ -777,7 +663,7 @@ void SV_ReadClientMessage(void) return; } - cmd = MSG_ReadChar (); + cmd = MSG_ReadByte (); if (cmd == -1) { // end of message @@ -833,7 +719,9 @@ void SV_ReadClientMessage(void) 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: @@ -842,7 +730,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++)