fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-03 06:20:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert Pa3PyX support for cross-map demos

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@975 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Eric Wasylishen 2014-08-25 02:55:16 +00:00
parent 9bd02ae55b
commit 526f90d69b
3 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Quake/cl_demo.c
View file

@ -92,13 +92,6 @@ static int CL_GetDemoMessage (void)
// decide if it is time to grab the next message // decide if it is time to grab the next message
if (cls.signon == SIGNONS) // always grab until fully connected if (cls.signon == SIGNONS) // always grab until fully connected
{ {
// Wait for full frame update on stufftext messages:
// If the server stuffs a "reconnect", failing to wait
// for the client to re-initialize before accepting
// further messages freezes demo playback. -- Pa3PyX
if (host_framecount == cls.stufftext_frame)
return 0;
if (cls.timedemo) if (cls.timedemo)
{ {
if (host_framecount == cls.td_lastframe) if (host_framecount == cls.td_lastframe)
@ -446,10 +439,6 @@ void CL_PlayDemo_f (void)
// get rid of the menu and/or console // get rid of the menu and/or console
key_dest = key_game; key_dest = key_game;
// Get a new message on playback start.
// Moved from CL_TimeDemo_f to here, Pa3PyX.
cls.td_lastframe = -1;
} }
/* /*
@ -500,7 +489,6 @@ void CL_TimeDemo_f (void)
cls.timedemo = true; cls.timedemo = true;
cls.td_startframe = host_framecount; cls.td_startframe = host_framecount;
// cls.td_lastframe = -1; // get a new message this frame cls.td_lastframe = -1;
// Moved to CL_PlayDemo_f(), Pa3PyX.
} }

13
Quake/cl_parse.c
View file

@ -999,18 +999,7 @@ void CL_ParseServerMessage (void)
break; break;
case svc_stufftext: case svc_stufftext:
str = MSG_ReadString (); Cbuf_AddText (MSG_ReadString ());
// ericw -- hack - only wait for the full frame update if the stufftext
// contains "reconnect". some mods, e.g. honey, send stufftext every frame;
// if we were to set cls.stufftext_frame every frame, that would break
// the playback rate control (causing demos to play back in slow-motion
// if the client can't keep up)
if (strstr (str, "reconnect") != NULL)
{
cls.stufftext_frame = host_framecount; // allow full frame update
// in demo playback -- Pa3PyX
}
Cbuf_AddText (str);
break; break;
case svc_damage: case svc_damage:

1
Quake/client.h
View file

@ -120,7 +120,6 @@ typedef struct
FILE *demofile; FILE *demofile;
int td_lastframe; // to meter out one message a frame int td_lastframe; // to meter out one message a frame
int td_startframe; // host_framecount at start int td_startframe; // host_framecount at start
int stufftext_frame; // host_framecount when svc_stufftext is received
float td_starttime; // realtime at second frame of timedemo float td_starttime; // realtime at second frame of timedemo
// connection information // connection information