Rename qboolean to qbool

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 8238ff6240f6e59f0b504351870bbe0922f0452c..431b9a4e83a6579b805d40324f71b84519085f04 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -118,7 +118,7 @@ extern cvar_t r_fog_clear;
 
 int jpeg_supported = false;
 
-qboolean       scr_initialized;                // ready to draw
+qbool  scr_initialized;                // ready to draw
 
 float          scr_con_current;
 int                    scr_con_margin_bottom;
@@ -131,7 +131,7 @@ static void SCR_ScreenShot_f(cmd_state_t *cmd);
 static void R_Envmap_f(cmd_state_t *cmd);
 
 // backend
-void R_ClearScreen(qboolean fogcolor);
+void R_ClearScreen(qbool fogcolor);
 
 /*
 ===============================================================================
@@ -727,7 +727,7 @@ void SCR_DrawConsole (void)
                con_vislines = 0;
 }
 
-qboolean scr_loading = false;
+qbool scr_loading = false;
 
 /*
 ===============
@@ -735,7 +735,7 @@ SCR_BeginLoadingPlaque
 
 ================
 */
-void SCR_BeginLoadingPlaque (qboolean startup)
+void SCR_BeginLoadingPlaque (qbool startup)
 {
        scr_loading = true;
        SCR_UpdateLoadingScreen(false, startup);
@@ -1397,8 +1397,8 @@ void SCR_ScreenShot_f(cmd_state_t *cmd)
        char filename[MAX_QPATH];
        unsigned char *buffer1;
        unsigned char *buffer2;
-       qboolean jpeg = (scr_screenshot_jpeg.integer != 0);
-       qboolean png = (scr_screenshot_png.integer != 0) && !jpeg;
+       qbool jpeg = (scr_screenshot_jpeg.integer != 0);
+       qbool png = (scr_screenshot_png.integer != 0) && !jpeg;
        char vabuf[1024];
 
        if (Cmd_Argc(cmd) == 2)
@@ -1790,7 +1790,7 @@ struct envmapinfo_s
 {
        float angles[3];
        const char *name;
-       qboolean flipx, flipy, flipdiagonaly;
+       qbool flipx, flipy, flipdiagonaly;
 }
 envmapinfo[12] =
 {
@@ -1961,10 +1961,10 @@ void SHOWLMP_drawall(void)
 
 // buffer1: 4*w*h
 // buffer2: 3*w*h (or 4*w*h if screenshotting alpha too)
-qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean png, qboolean gammacorrect, qboolean keep_alpha)
+qbool SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, int x, int y, int width, int height, qbool flipx, qbool flipy, qbool flipdiagonal, qbool jpeg, qbool png, qbool gammacorrect, qbool keep_alpha)
 {
        int     indices[4] = {0,1,2,3}; // BGRA
-       qboolean ret;
+       qbool ret;
 
        GL_ReadPixelsBGRA(x, y, width, height, buffer1);
 
@@ -2052,7 +2052,7 @@ static void SCR_DrawTouchscreenOverlay(void)
        }
 }
 
-void R_ClearScreen(qboolean fogcolor)
+void R_ClearScreen(qbool fogcolor)
 {
        float clearcolor[4];
        if (scr_screenshot_alpha.integer)
@@ -2085,8 +2085,8 @@ typedef struct loadingscreenstack_s
 }
 loadingscreenstack_t;
 static loadingscreenstack_t *loadingscreenstack = NULL;
-static qboolean loadingscreendone = false;
-static qboolean loadingscreencleared = false;
+static qbool loadingscreendone = false;
+static qbool loadingscreencleared = false;
 static float loadingscreenheight = 0;
 rtexture_t *loadingscreentexture = NULL;
 static float loadingscreentexture_vertex3f[12];
@@ -2371,7 +2371,7 @@ void SCR_PushLoadingScreen (const char *msg, float len_in_parent)
                SCR_UpdateLoadingScreenIfShown();
 }
 
-void SCR_PopLoadingScreen (qboolean redraw)
+void SCR_PopLoadingScreen (qbool redraw)
 {
        loadingscreenstack_t *s = loadingscreenstack;
 
@@ -2390,7 +2390,7 @@ void SCR_PopLoadingScreen (qboolean redraw)
                SCR_UpdateLoadingScreenIfShown();
 }
 
-void SCR_ClearLoadingScreen (qboolean redraw)
+void SCR_ClearLoadingScreen (qbool redraw)
 {
        while(loadingscreenstack)
                SCR_PopLoadingScreen(redraw && !loadingscreenstack->prev);
@@ -2477,7 +2477,7 @@ static cachepic_t *loadingscreenpic;
 static float loadingscreenpic_vertex3f[12];
 static float loadingscreenpic_texcoord2f[8];
 
-static void SCR_DrawLoadingScreen_SharedSetup (qboolean clear)
+static void SCR_DrawLoadingScreen_SharedSetup (qbool clear)
 {
        r_viewport_t viewport;
        float x, y, w, h, sw, sh, f;
@@ -2577,7 +2577,7 @@ static double loadingscreen_lastupdate;
 
 static void SCR_UpdateVars(void);
 
-void SCR_UpdateLoadingScreen (qboolean clear, qboolean startup)
+void SCR_UpdateLoadingScreen (qbool clear, qbool startup)
 {
        keydest_t       old_key_dest;
        int                     old_key_consoleactive;
@@ -2663,12 +2663,12 @@ void SCR_UpdateLoadingScreen (qboolean clear, qboolean startup)
        key_consoleactive = old_key_consoleactive;
 }
 
-qboolean R_Stereo_ColorMasking(void)
+qbool R_Stereo_ColorMasking(void)
 {
        return r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer;
 }
 
-qboolean R_Stereo_Active(void)
+qbool R_Stereo_Active(void)
 {
        return (vid.stereobuffer || r_stereo_sidebyside.integer || r_stereo_horizontal.integer || r_stereo_vertical.integer || R_Stereo_ColorMasking());
 }