some const fixes and type fixes found by gcc -combine

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index fb52f0410a96270f34eaef99670e4e2fb4ecec31..52d93d4564ffb6d0ad339be4a4c88c9f65a9e9ac 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -90,7 +90,7 @@ Called for important messages that should stay in the center of the screen
 for a few moments
 ==============
 */
-void SCR_CenterPrint(char *str)
+void SCR_CenterPrint(const char *str)
 {
        strlcpy (scr_centerstring, str, sizeof (scr_centerstring));
        scr_centertime_off = scr_centertime.value;
@@ -2039,7 +2039,7 @@ void SCR_UpdateLoadingScreen (qboolean clear)
                return;
        // release mouse grab while loading
        if (!vid.fullscreen)
-               VID_GrabMouse(false);
+               VID_SetMouse(false, false, false);
        CHECKGLERROR
        qglViewport(0, 0, vid.width, vid.height);CHECKGLERROR
        //qglDisable(GL_SCISSOR_TEST);CHECKGLERROR
@@ -2113,7 +2113,6 @@ void CL_UpdateScreen(void)
 {
        double rendertime1;
        float conwidth, conheight;
-       qboolean grabmouse;
 
        if (!scr_initialized || !con_initialized)
                return;                         // not initialized yet
@@ -2273,23 +2272,16 @@ void CL_UpdateScreen(void)
        else
                cl_updatescreen_quality = 1;
 
-       if (key_consoleactive)
-               grabmouse = false;
+       if (!vid_activewindow)
+               VID_SetMouse(false, false, false);
+       else if (key_consoleactive)
+               VID_SetMouse(vid.fullscreen, false, false);
        else if (key_dest == key_menu_grabbed)
-               grabmouse = true;
+               VID_SetMouse(true, !in_client_mouse, true);
        else if (key_dest == key_menu)
-               grabmouse = !in_client_mouse;
-       else if (key_dest == key_game)
-               grabmouse = vid_mouse.integer && !cls.demoplayback && !cl.csqc_wantsmousemove;
+               VID_SetMouse(vid.fullscreen, !in_client_mouse, true);
        else
-               grabmouse = false;
-       vid.mouseaim = grabmouse;
-       if (vid.fullscreen)
-               grabmouse = true;
-       if (!vid_activewindow)
-               grabmouse = false;
-
-       VID_GrabMouse(grabmouse);
+               VID_SetMouse(vid.fullscreen, vid_mouse.integer && !cls.demoplayback && !cl.csqc_wantsmousemove, true);
 
        VID_Finish();
 }