fix for cvar tab completion crash

[xonotic/darkplaces.git] / cl_demo.c

diff --git a/cl_demo.c b/cl_demo.c
index 13fbed5b0ad43a0fcec26737b500c0da129bc92d..34c875eaae37ef43f7e46cc7a4f3a802f08a7080 100644 (file)
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -47,7 +47,7 @@ void CL_StopPlayback (void)
        if (!cls.demoplayback)
                return;
 
-       fclose (cls.demofile);
+       Qclose (cls.demofile);
        cls.demoplayback = false;
        cls.demofile = NULL;
        cls.state = ca_disconnected;
@@ -73,14 +73,14 @@ void CL_WriteDemoMessage (void)
                return;
 
        len = LittleLong (net_message.cursize);
-       fwrite (&len, 4, 1, cls.demofile);
+       Qwrite (cls.demofile, &len, 4);
        for (i=0 ; i<3 ; i++)
        {
                f = LittleFloat (cl.viewangles[i]);
-               fwrite (&f, 4, 1, cls.demofile);
+               Qwrite (cls.demofile, &f, 4);
        }
-       fwrite (net_message.data, net_message.cursize, 1, cls.demofile);
-       fflush (cls.demofile);
+       Qwrite (cls.demofile, net_message.data, net_message.cursize);
+       Qflush (cls.demofile);
 }
 
 /*
@@ -101,12 +101,12 @@ int CL_GetMessage (void)
                        return 0;
 
        // decide if it is time to grab the next message                
-               if (cls.signon == SIGNONS)      // allways grab until fully connected
+               if (cls.signon == SIGNONS)      // always grab until fully connected
                {
                        if (cls.timedemo)
                        {
                                if (host_framecount == cls.td_lastframe)
-                                       return 0;               // allready read this frame's message
+                                       return 0;               // already read this frame's message
                                cls.td_lastframe = host_framecount;
                        // if this is the second frame, grab the real td_starttime
                        // so the bogus time on the first frame doesn't count
@@ -120,19 +120,19 @@ int CL_GetMessage (void)
                }
                
        // get the next message
-               fread (&net_message.cursize, 4, 1, cls.demofile);
+               Qread (cls.demofile, &net_message.cursize, 4);
                VectorCopy (cl.mviewangles[0], cl.mviewangles[1]);
                for (i=0 ; i<3 ; i++)
                {
-                       r = fread (&f, 4, 1, cls.demofile);
+                       r = Qread (cls.demofile, &f, 4);
                        cl.mviewangles[0][i] = LittleFloat (f);
                }
                
                net_message.cursize = LittleLong (net_message.cursize);
                if (net_message.cursize > MAX_MSGLEN)
                        Host_Error ("Demo message > MAX_MSGLEN");
-               r = fread (net_message.data, net_message.cursize, 1, cls.demofile);
-               if (r != 1)
+               r = Qread (cls.demofile, net_message.data, net_message.cursize);
+               if (r != net_message.cursize)
                {
                        CL_StopPlayback ();
                        return 0;
@@ -186,7 +186,7 @@ void CL_Stop_f (void)
        CL_WriteDemoMessage ();
 
 // finish up
-       fclose (cls.demofile);
+       Qclose (cls.demofile);
        cls.demofile = NULL;
        cls.demorecording = false;
        Con_Printf ("Completed demo\n");
@@ -250,7 +250,7 @@ void CL_Record_f (void)
        COM_DefaultExtension (name, ".dem");
 
        Con_Printf ("recording to %s.\n", name);
-       cls.demofile = fopen (name, "wb");
+       cls.demofile = Qopen (name, "wb");
        if (!cls.demofile)
        {
                Con_Printf ("ERROR: couldn't open.\n");
@@ -258,7 +258,7 @@ void CL_Record_f (void)
        }
 
        cls.forcetrack = track;
-       fprintf (cls.demofile, "%i\n", cls.forcetrack);
+       Qprintf (cls.demofile, "%i\n", cls.forcetrack);
        
        cls.demorecording = true;
 }
@@ -286,6 +286,8 @@ void CL_PlayDemo_f (void)
                return;
        }
 
+//     SCR_BeginLoadingPlaque();
+
 //
 // disconnect from server
 //
@@ -298,7 +300,7 @@ void CL_PlayDemo_f (void)
        COM_DefaultExtension (name, ".dem");
 
        Con_Printf ("Playing demo from %s.\n", name);
-       COM_FOpenFile (name, &cls.demofile, false);
+       COM_FOpenFile (name, &cls.demofile, false, true);
        if (!cls.demofile)
        {
                Con_Printf ("ERROR: couldn't open.\n");
@@ -310,7 +312,7 @@ void CL_PlayDemo_f (void)
        cls.state = ca_connected;
        cls.forcetrack = 0;
 
-       while ((c = getc(cls.demofile)) != '\n')
+       while ((c = Qgetc(cls.demofile)) != '\n')
                if (c == '-')
                        neg = true;
                else