From 9af21d3741096efe37b86450db70a404890b8fdf Mon Sep 17 00:00:00 2001 From: Spoike Date: Mon, 23 Jul 2007 12:03:33 +0000 Subject: [PATCH] Fixed a fairly old ommision, and a small quirk... git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2543 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 14224dbbe..6b0a57fe4 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -1454,6 +1454,12 @@ void CL_CheckServerInfo(void) cls.allow_anyparticles = false; + if (cls.demoplayback) + cl.fpd = 0; + else + cl.fpd = atoi(Info_ValueForKey(cl.serverinfo, "fpd")); + + s = Info_ValueForKey(cl.serverinfo, "status"); oldstate = cl.ktprostate; if (!stricmp(s, "standby")) @@ -2466,10 +2472,10 @@ void CL_ReadPackets (void) else if (!Netchan_Process(&cls.netchan)) continue; // wasn't accepted for some reason - if (cls.netchan.incoming_sequence >= cls.netchan.outgoing_sequence) - { - Con_Printf("Server is in a timewarp (%i packets)\n", cls.netchan.incoming_sequence - cls.netchan.outgoing_sequence+1); - cls.netchan.outgoing_sequence = cls.netchan.incoming_sequence + 1; + if (cls.netchan.incoming_sequence > cls.netchan.outgoing_sequence) + { //server should not be responding to packets we have not sent yet + Con_Printf("Server is from the future! (%i packets)\n", cls.netchan.incoming_sequence - cls.netchan.outgoing_sequence); + cls.netchan.outgoing_sequence = cls.netchan.incoming_sequence; } CL_ParseServerMessage (); break;