nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-26 22:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make playqtv slightly more robust. Only slightly. There really should be a better fix for this.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2872 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2008-01-23 01:36:51 +00:00
parent b6fc3c7668
commit 18ee105ed5
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
engine/client/cl_demo.c
View file

@ -487,6 +487,8 @@ readnext:
if (readdemobytes(&demopos, &msecsadded, sizeof(msecsadded)) != sizeof(msecsadded)) if (readdemobytes(&demopos, &msecsadded, sizeof(msecsadded)) != sizeof(msecsadded))
{ {
Con_Printf("Not enough buffered\n");
olddemotime = realtime; //if we ran out of buffered demo, delay the demo parsing a little
return 0; return 0;
} }
demotime = olddemotime + msecsadded*(1.0f/1000); demotime = olddemotime + msecsadded*(1.0f/1000);
@ -495,7 +497,11 @@ readnext:
else else
{ {
if (readdemobytes(&demopos, &demotime, sizeof(demotime)) != sizeof(demotime)) if (readdemobytes(&demopos, &demotime, sizeof(demotime)) != sizeof(demotime))
{
Con_Printf("Not enough buffered\n");
olddemotime = realtime; //if we ran out of buffered demo, delay the demo parsing a little
return 0; return 0;
}
demotime = LittleFloat(demotime); demotime = LittleFloat(demotime);
} }
@ -534,7 +540,7 @@ readnext:
if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV) if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
{ {
if (msecsadded || cls.netchan.incoming_sequence < 2) if ((msecsadded || cls.netchan.incoming_sequence < 2) && olddemotime != demotime)
{ {
cls.netchan.incoming_sequence++; cls.netchan.incoming_sequence++;
cls.netchan.incoming_acknowledged++; cls.netchan.incoming_acknowledged++;
@ -543,14 +549,16 @@ readnext:
} }
} }
olddemotime = demotime;
if (cls.state < ca_demostart) if (cls.state < ca_demostart)
Host_Error ("CL_GetDemoMessage: cls.state != ca_active"); Host_Error ("CL_GetDemoMessage: cls.state != ca_active");
// get the msg type // get the msg type
if (!readdemobytes (&demopos, &c, sizeof(c))) if (!readdemobytes (&demopos, &c, sizeof(c)))
{
Con_Printf("Not enough buffered\n");
olddemotime = realtime+1;
return 0; return 0;
}
// Con_Printf("demo packet %x\n", (int)c); // Con_Printf("demo packet %x\n", (int)c);
switch (c&7) switch (c&7)
{ {
@ -602,6 +610,8 @@ readnext:
r = readdemobytes (&demopos, &q1cmd, sizeof(q1cmd)); r = readdemobytes (&demopos, &q1cmd, sizeof(q1cmd));
if (r != sizeof(q1cmd)) if (r != sizeof(q1cmd))
{ {
Con_Printf("Not enough buffered\n");
olddemotime = realtime+1;
CL_StopPlayback (); CL_StopPlayback ();
return 0; return 0;
} }
@ -633,7 +643,11 @@ readnext:
readit: readit:
// get the next message // get the next message
if (readdemobytes (&demopos, &msglength, 4) != 4) if (readdemobytes (&demopos, &msglength, 4) != 4)
{
Con_Printf("Not enough buffered\n");
olddemotime = realtime+1;
return 0; return 0;
}
msglength = LittleLong (msglength); msglength = LittleLong (msglength);
//Con_Printf("read: %ld bytes\n", msglength); //Con_Printf("read: %ld bytes\n", msglength);
if ((unsigned int)msglength > MAX_OVERALLMSGLEN) if ((unsigned int)msglength > MAX_OVERALLMSGLEN)
@ -644,6 +658,8 @@ readit:
} }
if (readdemobytes (&demopos, net_message.data, msglength) != msglength) if (readdemobytes (&demopos, net_message.data, msglength) != msglength)
{ {
Con_Printf("Not enough buffered\n");
olddemotime = realtime+1;
return 0; return 0;
} }
net_message.cursize = msglength; net_message.cursize = msglength;
@ -686,7 +702,10 @@ readit:
case dem_multiple: case dem_multiple:
if (readdemobytes (&demopos, &i, sizeof(i)) != sizeof(i)) if (readdemobytes (&demopos, &i, sizeof(i)) != sizeof(i))
{
olddemotime = realtime;
return 0; return 0;
}
cls_lastto = LittleLong(i); cls_lastto = LittleLong(i);
cls_lasttype = dem_multiple; cls_lasttype = dem_multiple;
goto readit; goto readit;
@ -713,6 +732,8 @@ readit:
} }
demo_flushbytes(demopos); demo_flushbytes(demopos);
olddemotime = demotime;
return 1; return 1;
} }
@ -1497,7 +1518,7 @@ void CL_QTVPlay (vfsfile_t *newf, qboolean iseztv)
void CL_Demo_ClientCommand(char *commandtext) void CL_Demo_ClientCommand(char *commandtext)
{ {
unsigned char b = 1; unsigned char b = 1;
unsigned short len = LittleShort(strlen(commandtext) + 4); unsigned short len = LittleShort((unsigned short)(strlen(commandtext) + 4));
#ifndef _MSC_VER #ifndef _MSC_VER
#warning "this needs buffering safely" #warning "this needs buffering safely"
#endif #endif