curl: longer URLs

[xonotic/darkplaces.git] / sv_user.c

diff --git a/sv_user.c b/sv_user.c
index 0bc1090fb2d25e0306179ac5792e27fad755dfe6..882418c6706c8c676ce0bbdcf72c49bb32b99092 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -461,7 +461,7 @@ void SV_ReadClientMove (void)
        // read ping time
        if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3 && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5 && sv.protocol != PROTOCOL_DARKPLACES6)
                move->sequence = MSG_ReadLong ();
-       move->time = MSG_ReadFloat ();
+       move->time = move->clienttime = MSG_ReadFloat ();
        if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
        move->receivetime = (float)sv.time;
 
@@ -585,7 +585,7 @@ void SV_ExecuteClientMoves(void)
                                // this is a new move
                                move->time = bound(sv.time - 1, move->time, sv.time); // prevent slowhack/speedhack combos
                                move->time = max(move->time, host_client->cmd.time); // prevent backstepping of time
-                               moveframetime = bound(0, move->time - host_client->cmd.time, 0.1);
+                               moveframetime = bound(0, move->time - host_client->cmd.time, min(0.1, sv.frametime * sv_clmovement_waitforinput.integer));
                                //Con_Printf("movesequence = %i (%i lost), moveframetime = %f\n", move->sequence, move->sequence ? move->sequence - host_client->movesequence - 1 : 0, moveframetime);
                                host_client->cmd = *move;
                                host_client->movesequence = move->sequence;
@@ -645,9 +645,9 @@ void SV_ExecuteClientMoves(void)
        }
 
        // calculate average ping time
-       host_client->ping = host_client->cmd.receivetime - host_client->cmd.time;
+       host_client->ping = host_client->cmd.receivetime - host_client->cmd.clienttime;
 #ifdef NUM_PING_TIMES
-       host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = host_client->cmd.receivetime - host_client->cmd.time;
+       host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = host_client->cmd.receivetime - host_client->cmd.clienttime;
        host_client->num_pings++;
        for (i=0, total = 0;i < NUM_PING_TIMES;i++)
                total += host_client->ping_times[i];
@@ -706,7 +706,10 @@ void SV_ApplyClientMove (void)
 void SV_FrameLost(int framenum)
 {
        if (host_client->entitydatabase5)
+       {
                EntityFrame5_LostFrame(host_client->entitydatabase5, framenum);
+               EntityFrameCSQC_LostFrame(host_client, framenum);
+       }
 }
 
 void SV_FrameAck(int framenum)
@@ -857,7 +860,7 @@ clc_stringcmd_invalid:
                                                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));
+                                               Host_ClientCommands("\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;