physics: fix and refactor unsticking

[xonotic/darkplaces.git] / cap_avi.c

diff --git a/cap_avi.c b/cap_avi.c
index 9a238e80ff4d335994191019f6237e92acc3bf77..54f636dcd2933fbe2d052d55053c97b611eff94e 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_Printf("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]);
@@ -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
@@ -473,7 +473,7 @@ static void SCR_CaptureVideo_Avi_SoundFrame(const portable_sampleframe_t *paintb
                out_ptr[3] = (unsigned char)(n1 >> 8);
        }
 
-       x = length*4;
+       x = (int)length*4;
        if(format->canseek)
        {
                SCR_CaptureVideo_RIFF_OverflowCheck(8 + x);
@@ -504,7 +504,7 @@ void SCR_CaptureVideo_Avi_BeginVideo(void)
        double aspect;
        char vabuf[1024];
 
-       aspect = vid.width / (vid.height * vid_pixelheight.value);
+       aspect = vid.mode.width / (vid.mode.height * vid_pixelheight.value);
 
        cls.capturevideo.format = CAPTUREVIDEOFORMAT_AVI_I420;
        cls.capturevideo.formatextension = "avi";