X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_demo.c;h=627ccd12d68eaf4fbcd59355865512310a121f56;hb=8a26a83cf03414a1066eba3bbada89f4f97f797d;hp=be9bf40dd47de9f1935475db9e5ca4589244047b;hpb=720d39fd489a6cdd5fb050a4d1263ca77293fdab;p=xonotic%2Fdarkplaces.git

diff --git a/cl_demo.c b/cl_demo.c
index be9bf40d..627ccd12 100644
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
+int old_vsync = 0;
+
 void CL_FinishTimeDemo (void);
 
 /*
@@ -42,10 +44,9 @@ CL_NextDemo
 Called to play the next demo in the demo loop
 =====================
 */
-extern void Call_MR_ToggleMenu_f (void);
 void CL_NextDemo (void)
 {
-	char	str[1024];
+	char	str[MAX_INPUTLINE];
 
 	if (cls.demonum == -1)
 		return;		// don't play demos
@@ -57,9 +58,6 @@ void CL_NextDemo (void)
 		{
 			Con_Print("No demos listed with startdemos\n");
 			cls.demonum = -1;
-			// put up menu instead of staring at console
-			if (key_dest != key_menu)
-				Call_MR_ToggleMenu_f();
 			return;
 		}
 	}
@@ -88,6 +86,10 @@ void CL_StopPlayback (void)
 
 	if (cls.timedemo)
 		CL_FinishTimeDemo ();
+
+	if (COM_CheckParm("-demo") || COM_CheckParm("-demolooponly"))
+		Host_Quit_f();
+
 }
 
 /*
@@ -114,7 +116,6 @@ void CL_WriteDemoMessage (void)
 		FS_Write (cls.demofile, &f, 4);
 	}
 	FS_Write (cls.demofile, net_message.data, net_message.cursize);
-	FS_Flush (cls.demofile);
 }
 
 /*
@@ -163,11 +164,11 @@ void CL_ReadDemoMessage(void)
 					cls.td_starttime = realtime;
 				if (host_framecount > cls.td_startframe + 2)
 				{
-					cls.td_minframetime = min(cls.td_minframetime, host_realframetime);
-					cls.td_maxframetime = max(cls.td_maxframetime, host_realframetime);
+					cls.td_minframetime = min(cls.td_minframetime, cl.realframetime);
+					cls.td_maxframetime = max(cls.td_maxframetime, cl.realframetime);
 				}
 				else
-					cls.td_minframetime = cls.td_maxframetime = host_realframetime;
+					cls.td_minframetime = cls.td_maxframetime = cl.realframetime;
 			}
 			else if (cl.time <= cl.mtime[0])
 			{
@@ -184,11 +185,11 @@ void CL_ReadDemoMessage(void)
 		VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
 		for (i = 0;i < 3;i++)
 		{
-			r = FS_Read(cls.demofile, &f, 4);
+			r = (int)FS_Read(cls.demofile, &f, 4);
 			cl.mviewangles[0][i] = LittleFloat(f);
 		}
 
-		if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == (size_t)net_message.cursize)
+		if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == net_message.cursize)
 		{
 			MSG_BeginReading();
 			CL_ParseServerMessage();
@@ -289,7 +290,7 @@ void CL_Record_f (void)
 
 	// open the demo file
 	Con_Printf("recording to %s.\n", name);
-	cls.demofile = FS_Open (name, "wb", false);
+	cls.demofile = FS_Open (name, "wb", false, false);
 	if (!cls.demofile)
 	{
 		Con_Print("ERROR: couldn't open.\n");
@@ -312,7 +313,7 @@ play [demoname]
 */
 void CL_PlayDemo_f (void)
 {
-	char	name[256];
+	char	name[MAX_QPATH];
 	int c;
 	qboolean neg = false;
 
@@ -327,17 +328,18 @@ void CL_PlayDemo_f (void)
 
 	// disconnect from server
 	CL_Disconnect ();
-	Host_ShutdownServer (false);
+	Host_ShutdownServer ();
 
 	// update networking ports (this is mainly just needed at startup)
-	NetConn_ClientFrame();
+	NetConn_UpdateSockets();
 
 	// open the demo file
 	strlcpy (name, Cmd_Argv(1), sizeof (name));
 	FS_DefaultExtension (name, ".dem", sizeof (name));
+	cls.protocol = PROTOCOL_QUAKE;
 
 	Con_Printf("Playing demo from %s.\n", name);
-	cls.demofile = FS_Open (name, "rb", false);
+	cls.demofile = FS_Open (name, "rb", false, false);
 	if (!cls.demofile)
 	{
 		Con_Print("ERROR: couldn't open.\n");
@@ -345,8 +347,6 @@ void CL_PlayDemo_f (void)
 		return;
 	}
 
-	SCR_BeginLoadingPlaque ();
-
 	strlcpy(cls.demoname, name, sizeof(cls.demoname));
 	cls.demoplayback = true;
 	cls.state = ca_connected;
@@ -415,7 +415,6 @@ void CL_TimeDemo_f (void)
 	// instantly hide console and deactivate it
 	key_dest = key_game;
 	key_consoleactive = 0;
-	scr_conlines = 0;
 	scr_con_current = 0;
 
 	cls.timedemo = true;