From a7bf2f59a4dcc83cc9f02f382e2035dafb81f173 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Mon, 25 Aug 2014 02:55:25 +0000 Subject: [PATCH] Apply Baker's fix for cross-map demo playback (http://forums.inside3d.com/viewtopic.php?f=3&t=2397). With that alone, the console would come down and slide up when the map changes in a demo. I added a SCR_BeginLoadingPlaque() call in CL_ParseServerInfo, only done during demo playback, which shows the loading plaque and prevents the console from appearing and sliding up. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@976 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/cl_parse.c | 6 ++++++ Quake/host_cmd.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/Quake/cl_parse.c b/Quake/cl_parse.c index 89501cac..79418d52 100644 --- a/Quake/cl_parse.c +++ b/Quake/cl_parse.c @@ -261,6 +261,12 @@ void CL_ParseServerInfo (void) char sound_precache[MAX_SOUNDS][MAX_QPATH]; Con_DPrintf ("Serverinfo packet received.\n"); + +// ericw -- bring up loading plaque for map changes within a demo. +// it will be hidden in CL_SignonReply. + if (cls.demoplayback) + SCR_BeginLoadingPlaque(); + // // wipe the client_state_t struct // diff --git a/Quake/host_cmd.c b/Quake/host_cmd.c index 36e2d535..a0f4f2f6 100644 --- a/Quake/host_cmd.c +++ b/Quake/host_cmd.c @@ -972,6 +972,9 @@ This is sent just before a server changes levels */ void Host_Reconnect_f (void) { + if (cls.demoplayback) // cross-map demo playback fix from Baker + return; + SCR_BeginLoadingPlaque (); cls.signon = 0; // need new connection messages }