Remove a bit of cruft left in Cvar_RestoreInitState()

[xonotic/darkplaces.git] / cap_avi.c

diff --git a/cap_avi.c b/cap_avi.c
index 063ee097eaae8e3b46357a4e8f49f3569c557ac3..136a9ec24471358beed5599ca5b31b397d147ec5 100644 (file)
--- a/cap_avi.c
+++ b/cap_avi.c
@@ -18,7 +18,7 @@ typedef struct capturevideostate_avi_formatspecific_s
        fs_offset_t videofile_ix_master_video_start_offset;
        fs_offset_t videofile_ix_movistart;
        fs_offset_t position;
-       qboolean canseek;
+       qbool canseek;
        sizebuf_t riffbuffer;
        unsigned char riffbufferdata[128];
        sizebuf_t riffindexbuffer;
@@ -147,7 +147,7 @@ static void SCR_CaptureVideo_RIFF_Pop(void)
                if(sizehint != -1)
                {
                        int i;
-                       Con_Warnf("WARNING: invalid size hint %d when writing video data (actual size: %d)\n", (int) sizehint, x);
+                       Con_Printf(CON_WARN "WARNING: invalid size hint %d when writing video data (actual size: %d)\n", (int) sizehint, x);
                        for(i = 0; i <= format->riffstacklevel; ++i)
                        {
                                Con_Printf("  RIFF level %d = %s\n", i, format->riffstackfourcc[i]);
@@ -188,10 +188,10 @@ static void SCR_CaptureVideo_RIFF_IndexEntry(const char *chunkfourcc, int chunks
 {
        LOAD_FORMATSPECIFIC_AVI();
        if(!format->canseek)
-               Sys_Error("SCR_CaptureVideo_RIFF_IndexEntry called on non-seekable AVI");
+               Sys_Abort("SCR_CaptureVideo_RIFF_IndexEntry called on non-seekable AVI");
 
        if (format->riffstacklevel != 2)
-               Sys_Error("SCR_Capturevideo_RIFF_IndexEntry: RIFF stack level is %i (should be 2)\n", format->riffstacklevel);
+               Sys_Abort("SCR_Capturevideo_RIFF_IndexEntry: RIFF stack level is %i (should be 2)\n", format->riffstacklevel);
        GrowBuf(&format->riffindexbuffer, 16);
        SCR_CaptureVideo_RIFF_Flush();
        MSG_WriteUnterminatedString(&format->riffindexbuffer, chunkfourcc);
@@ -209,7 +209,7 @@ static void SCR_CaptureVideo_RIFF_MakeIxChunk(const char *fcc, const char *dwChu
        fs_offset_t pos, sz;
        
        if(!format->canseek)
-               Sys_Error("SCR_CaptureVideo_RIFF_MakeIxChunk called on non-seekable AVI");
+               Sys_Abort("SCR_CaptureVideo_RIFF_MakeIxChunk called on non-seekable AVI");
 
        if(*masteridx_count >= AVI_MASTER_INDEX_SIZE)
                return;
@@ -269,7 +269,7 @@ static void SCR_CaptureVideo_RIFF_MakeIxChunk(const char *fcc, const char *dwChu
        FS_Seek(cls.capturevideo.videofile, 0, SEEK_END); // return value doesn't matter here
 }
 
-static void SCR_CaptureVideo_RIFF_Finish(qboolean final)
+static void SCR_CaptureVideo_RIFF_Finish(qbool final)
 {
        LOAD_FORMATSPECIFIC_AVI();
        // close the "movi" list
@@ -312,7 +312,7 @@ static void SCR_CaptureVideo_RIFF_OverflowCheck(int framesize)
        fs_offset_t cursize;
        //fs_offset_t curfilesize;
        if (format->riffstacklevel != 2)
-               Sys_Error("SCR_CaptureVideo_RIFF_OverflowCheck: chunk stack leakage!\n");
+               Sys_Abort("SCR_CaptureVideo_RIFF_OverflowCheck: chunk stack leakage!\n");
        
        if(!format->canseek)
                return;
@@ -707,7 +707,7 @@ void SCR_CaptureVideo_Avi_BeginVideo(void)
                // we're done with the headers now...
                SCR_CaptureVideo_RIFF_Flush();
                if (format->riffstacklevel != 2)
-                       Sys_Error("SCR_CaptureVideo_BeginVideo: broken AVI writing code (stack level is %i (should be 2) at end of headers)\n", format->riffstacklevel);
+                       Sys_Abort("SCR_CaptureVideo_BeginVideo: broken AVI writing code (stack level is %i (should be 2) at end of headers)\n", format->riffstacklevel);
 
                if(!format->canseek)
                {