X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_demo.c;h=2ab796bcd22418cf891383062d83ed8969f69d2a;hp=0750b423e340c41fe18643ed1ac9066be0eb003f;hb=7c81e060b8ad1da8f3fafd5ff2a6d580d933653b;hpb=7697052155d077fd9816aeb879951cc0895c9b02

diff --git a/cl_demo.c b/cl_demo.c
index 0750b423..2ab796bc 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);
 
 /*
@@ -56,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)
-				M_ToggleMenu_f();
 			return;
 		}
 	}
@@ -87,6 +86,10 @@ void CL_StopPlayback (void)
 
 	if (cls.timedemo)
 		CL_FinishTimeDemo ();
+
+	if (COM_CheckParm("-demo") || COM_CheckParm("-demolooponly"))
+		Host_Quit_f();
+
 }
 
 /*
@@ -113,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);
 }
 
 /*
@@ -183,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();
@@ -288,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");
@@ -336,7 +338,7 @@ void CL_PlayDemo_f (void)
 	FS_DefaultExtension (name, ".dem", sizeof (name));
 
 	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");
@@ -344,8 +346,6 @@ void CL_PlayDemo_f (void)
 		return;
 	}
 
-	SCR_BeginLoadingPlaque ();
-
 	strlcpy(cls.demoname, name, sizeof(cls.demoname));
 	cls.demoplayback = true;
 	cls.state = ca_connected;
@@ -414,7 +414,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;