This should more closely match other engines in timedemo results.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3729 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2011-01-29 22:24:19 +00:00
parent dc2212aa84
commit 386424a8e6
3 changed files with 19 additions and 14 deletions

View file

@ -534,21 +534,26 @@ readnext:
// decide if it is time to grab the next message
if (cls.timedemo)
{
if (cls.td_lastframe < 0)
cls.td_lastframe = demotime;
else if (demotime > cls.td_lastframe)
if (cls.state == ca_active)
{
cls.td_lastframe = demotime;
return 0; // already read this frame's message
}
if (cls.td_startframe == -1 && cls.state == ca_active)
{ //start the timer only once we are connected.
cls.td_starttime = Sys_DoubleTime();
cls.td_startframe = host_framecount;
if (cls.td_lastframe < 0)
cls.td_lastframe = host_framecount;
else if (host_framecount == cls.td_lastframe)
{
cls.td_lastframe = host_framecount;
return 0; // already read this frame's message
}
if (cls.td_startframe == -1)
{ //start the timer only once we are connected.
cls.td_starttime = Sys_DoubleTime();
cls.td_startframe = host_framecount;
//force the console up, we're done loading.
key_dest = key_game;
scr_con_current = 0;
//force the console up, we're done loading.
key_dest = key_game;
scr_con_current = 0;
}
if (cls.td_startframe == host_framecount+1)
cls.td_starttime = Sys_DoubleTime();
}
demtime = demotime; // warp
}

View file

@ -2567,6 +2567,7 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
{
case 1:
cl.sendprespawn = true;
CL_RequestNextDownload();
break;
case 2:

View file

@ -479,7 +479,6 @@ int FS_FLocateFile(const char *filename, FSLF_ReturnType_e returntype, flocation
char cleanpath[MAX_QPATH];
void *pf;
//Con_Printf("Finding %s: ", filename);
filename = FS_GetCleanPath(filename, cleanpath, sizeof(cleanpath));
if (!filename)