increased M_MAX_EDICTS to 32768

[xonotic/darkplaces.git] / sv_user.c

diff --git a/sv_user.c b/sv_user.c
index d880a87cc00570988897e9043c69a503056b29e5..eeb7f10f4d6ef8ad4150db66ab9ada4da97c1b6c 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -31,6 +31,7 @@ cvar_t sv_wateraccelerate = {0, "sv_wateraccelerate", "-1", "rate at which a pla
 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;
 
@@ -459,7 +460,7 @@ qboolean 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;
 
        // calculate average ping time
        host_client->ping = move->receivetime - move->time;
@@ -533,8 +534,8 @@ qboolean SV_ReadClientMove (void)
 
        // disable clientside movement prediction in some cases
        if (ceil((move->receivetime - move->time) * 1000.0) < sv_clmovement_minping.integer)
-               host_client->clmovement_disable_minpingtimeout = realtime + sv_clmovement_minping_disabletime.value / 1000.0;
-       if (!sv_clmovement_enable.integer || host_client->clmovement_disable_minpingtimeout > realtime)
+               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)
@@ -554,15 +555,20 @@ qboolean SV_ReadClientMove (void)
        {
                // 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 = bound(0, move->time - oldmovetime, 0.1);
                        double oldframetime = prog->globals.server->frametime;
+                       double oldframetime2 = sv.frametime;
                        //if (move->time - oldmovetime >= 0.1001)
                        //      Con_DPrintf("client move exceeds 100ms!  (time %f -> time %f)\n", oldmovetime, move->time);
+                       // the server and qc frametime values must be changed temporarily
+                       sv.frametime = frametime;
                        prog->globals.server->frametime = frametime;
                        SV_Physics_ClientEntity(host_client->edict);
+                       sv.frametime = oldframetime2;
                        prog->globals.server->frametime = oldframetime;
+                       host_client->clmovement_skipphysicsframes = sv_clmovement_waitforinput.integer;
                }
        }
        return kickplayer;
@@ -690,26 +696,8 @@ void SV_ReadClientMessage(void)
                                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
-                        || 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: