more loading screen improvements (weighting for different content types; don't update...

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index 752241d1fe47ef19935e1198e07f1d3a6b8a99de..c714e0eb636134351f4fc7d4e58679a4bcdab432 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -254,7 +254,7 @@ void VID_Finish (void)
        if (r_render.integer && !vid_hidden)
        {
                CHECKGLERROR
-               if (r_speeds.integer || gl_finish.integer)
+               if (r_speeds.integer == 2 || gl_finish.integer)
                {
                        qglFinish();CHECKGLERROR
                }
@@ -480,8 +480,8 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 {
        LONG    lRet = 1;
        int             fActive, fMinimized, temp;
-       char    state[256];
-       char    asciichar[4];
+       unsigned char state[256];
+       unsigned char asciichar[4];
        int             vkey;
        int             charlength;
        qboolean down = false;
@@ -810,7 +810,7 @@ int VID_InitMode (int fullscreen, int *width, int *height, int bpp, int refreshr
        };
        int windowpass;
        int pixelformat, newpixelformat;
-       int numpixelformats;
+       UINT numpixelformats;
        DWORD WindowStyle, ExWindowStyle;
        int CenterX, CenterY;
        const char *gldrivername;
@@ -956,13 +956,13 @@ int VID_InitMode (int fullscreen, int *width, int *height, int bpp, int refreshr
                                                Con_Printf("wrong bpp\n");
                                        continue;
                                }
-                               if(thismode.dmPelsWidth != (DWORD)width)
+                               if(thismode.dmPelsWidth != (DWORD)*width)
                                {
                                        if(developer.integer >= 100)
                                                Con_Printf("wrong width\n");
                                        continue;
                                }
-                               if(thismode.dmPelsHeight != (DWORD)height)
+                               if(thismode.dmPelsHeight != (DWORD)*height)
                                {
                                        if(developer.integer >= 100)
                                                Con_Printf("wrong height\n");