X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=sv_user.c;h=66aab652758ab81ca6eeba08f4fc34eefba49280;hb=6f66a9af15b9b6ff98946e72621797ba14253841;hp=2525785abb91d432e9f601a18e815d85fd633e60;hpb=c3001ce26f2c2fd69caa6af345ccca1d4376f4e5;p=xonotic%2Fdarkplaces.git diff --git a/sv_user.c b/sv_user.c index 2525785a..66aab652 100644 --- a/sv_user.c +++ b/sv_user.c @@ -26,6 +26,12 @@ cvar_t sv_idealpitchscale = {0, "sv_idealpitchscale","0.8", "how much to look up 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", "0", "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", "16", "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; @@ -182,7 +187,7 @@ void SV_AirAccelerate (vec3_t 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,188 +432,23 @@ 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 =================== */ -void SV_ReadClientMove (void) +qboolean SV_ReadClientMove (void) { + qboolean kickplayer = false; int i; - double oldmovetime; - usercmd_t *move = &host_client->cmd; +#ifdef NUM_PING_TIMES + double total; +#endif + double moveframetime; + usercmd_t newmove; + usercmd_t *move = &newmove; - oldmovetime = move->time; + memset(move, 0, sizeof(*move)); if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__); @@ -617,7 +457,11 @@ void SV_ReadClientMove (void) 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; + move->receivetime = (float)sv.time; + + // limit reported time to current time + // (incase the client is trying to cheat) + move->time = min(move->time, move->receivetime + sv.frametime); // read current angles for (i = 0;i < 3;i++) @@ -643,9 +487,9 @@ void SV_ReadClientMove (void) // 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 @@ -677,52 +521,92 @@ void SV_ReadClientMove (void) 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->sequence && move->sequence <= host_client->movesequence && move->sequence >= host_client->movesequence - 16) + { + // repeat of old input (to fight packet loss) + // the >= -16 check avoids frozen players after a level change + return kickplayer; + } + + // if the previous move has not been applied yet, we need to accumulate + // the impulse/buttons from it + if (!host_client->cmd.applied) + { + if (!move->impulse) + move->impulse = host_client->cmd.impulse; + move->buttons |= host_client->cmd.buttons; + } + + moveframetime = bound(0, move->time - host_client->cmd.time, 0.1); + //Con_Printf("movesequence = %i (%i lost), moveframetime = %f\n", move->sequence, move->sequence ? move->sequence - host_client->movesequence - 1 : 0, moveframetime); + + // 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; + + // 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 + + // only start accepting input once the player is spawned + if (host_client->spawned) { - // apply the latest accepted move to the entity fields + // at this point we know this input is new and should be stored + host_client->cmd = *move; host_client->movesequence = move->sequence; - if (host_client->movesequence) + // if using prediction, we need to perform moves when packets are + // received, even if multiple occur in one frame + // (they can't go beyond the current time so there is no cheat issue + // with this approach, and if they don't send input for a while they + // start moving anyway, so the longest 'lagaport' possible is + // determined by the sv_clmovement_waitforinput cvar) + if (host_client->movesequence && sv_clmovement_waitforinput.integer > 0 && moveframetime > 0) { - double frametime = move->time - oldmovetime; double oldframetime = prog->globals.server->frametime; - if (frametime > 0.1) - frametime = 0.1; - prog->globals.server->frametime = frametime; + double oldframetime2 = sv.frametime; + // the server and qc frametime values must be changed temporarily + sv.frametime = moveframetime; + prog->globals.server->frametime = moveframetime; SV_Physics_ClientEntity(host_client->edict); + sv.frametime = oldframetime2; prog->globals.server->frametime = oldframetime; + host_client->clmovement_skipphysicsframes = sv_clmovement_waitforinput.integer; } } + + return kickplayer; } void SV_ApplyClientMove (void) { -#ifdef NUM_PING_TIMES - int i; - float total; -#endif prvm_eval_t *val; usercmd_t *move = &host_client->cmd; if (!move->receivetime) return; - // 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 + // 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); @@ -747,8 +631,6 @@ void SV_ApplyClientMove (void) 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; - - memset(move, 0, sizeof(*move)); } void SV_FrameLost(int framenum) @@ -773,9 +655,10 @@ SV_ReadClientMessage =================== */ extern void SV_SendServerinfo(client_t *client); +extern sizebuf_t vm_tempstringsbuf; void SV_ReadClientMessage(void) { - int cmd, num; + int cmd, num, start; char *s; //MSG_BeginReading (); @@ -796,7 +679,7 @@ void SV_ReadClientMessage(void) return; } - cmd = MSG_ReadChar (); + cmd = MSG_ReadByte (); if (cmd == -1) { // end of message @@ -821,30 +704,15 @@ void SV_ReadClientMessage(void) Cmd_ExecuteString (s, src_client); else if (SV_ParseClientCommandQC) { - PRVM_G_INT(OFS_PARM0) = PRVM_SetEngineString(s); + int restorevm_tempstringsbuf_cursize; + restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize; + PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(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"); + vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } - 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 - || 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); else - Con_Printf("%s tried to %s\n", host_client->name, s); + Cmd_ExecuteString (s, src_client); break; case clc_disconnect: @@ -852,7 +720,61 @@ 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_ackdownloaddata: + start = MSG_ReadLong(); + num = MSG_ReadShort(); + if (host_client->download_file && host_client->download_started) + { + if (host_client->download_expectedposition == start) + { + int size = (int)FS_FileSize(host_client->download_file); + // a data block was successfully received by the client, + // update the expected position on the next data block + host_client->download_expectedposition = start + num; + // if this was the last data block of the file, it's done + if (host_client->download_expectedposition >= FS_FileSize(host_client->download_file)) + { + // tell the client that the download finished + // we need to calculate the crc now + // + // note: at this point the OS probably has the file + // entirely in memory, so this is a faster operation + // now than it was when the download started. + // + // it is also preferable to do this at the end of the + // download rather than the start because it reduces + // potential for Denial Of Service attacks against the + // server. + int crc; + unsigned char *temp; + FS_Seek(host_client->download_file, 0, SEEK_SET); + temp = Mem_Alloc(tempmempool, size); + FS_Read(host_client->download_file, temp, size); + crc = CRC_Block(temp, size); + Mem_Free(temp); + // calculated crc, send the file info to the client + // (so that it can verify the data) + Host_ClientCommands(va("\ncl_downloadfinished %i %i %s\n", size, crc, host_client->download_name)); + Con_DPrintf("Download of %s by %s has finished\n", host_client->download_name, host_client->name); + FS_Close(host_client->download_file); + host_client->download_file = NULL; + host_client->download_name[0] = 0; + host_client->download_expectedposition = 0; + host_client->download_started = false; + } + } + else + { + // a data block was lost, reset to the expected position + // and resume sending from there + FS_Seek(host_client->download_file, host_client->download_expectedposition, SEEK_SET); + } + } break; case clc_ackframe: