renamed makefile.bsd to BSDmakefile so that pmake will automatically find it (no...

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index d8f34cc215011eef5858a374aafc40aad852c592..da94d59fb00b65c31fdb143e8676bf34ccc2fa52 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -12,7 +12,7 @@ cvar_t scr_conspeed = {CVAR_SAVE, "scr_conspeed","900", "speed of console open/c
 cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1", "opacity of console background"};
 cvar_t scr_conbrightness = {CVAR_SAVE, "scr_conbrightness", "0.2", "brightness of console background (0 = black, 1 = image)"};
 cvar_t scr_conforcewhiledisconnected = {0, "scr_conforcewhiledisconnected", "1", "forces fullscreen console while disconnected"};
-cvar_t scr_menuforcewhiledisconnected = {0, "scr_menuforcewhiledisconnected", "1", "forces menu while disconnected"};
+cvar_t scr_menuforcewhiledisconnected = {0, "scr_menuforcewhiledisconnected", "0", "forces menu while disconnected"};
 cvar_t scr_centertime = {0, "scr_centertime","2", "how long centerprint messages show"};
 cvar_t scr_showram = {CVAR_SAVE, "showram","1", "show ram icon if low on surface cache memory (not used)"};
 cvar_t scr_showturtle = {CVAR_SAVE, "showturtle","0", "show turtle icon when framerate is too low (not used)"};
@@ -196,7 +196,7 @@ void SCR_DrawTurtle (void)
        if (count < 3)
                return;
 
-       DrawQ_Pic (0, 0, Draw_CachePic("gfx/turtle", false), 0, 0, 1, 1, 1, 1, 0);
+       DrawQ_Pic (0, 0, Draw_CachePic("gfx/turtle", true), 0, 0, 1, 1, 1, 1, 0);
 }
 
 /*
@@ -213,7 +213,7 @@ void SCR_DrawNet (void)
        if (cls.demoplayback)
                return;
 
-       DrawQ_Pic (64, 0, Draw_CachePic("gfx/net", false), 0, 0, 1, 1, 1, 1, 0);
+       DrawQ_Pic (64, 0, Draw_CachePic("gfx/net", true), 0, 0, 1, 1, 1, 1, 0);
 }
 
 /*
@@ -422,7 +422,7 @@ void R_TimeReport(char *desc)
        int length;
        int t;
 
-       if (r_speeds.integer < 2 || !r_timereport_active || r_showtrispass)
+       if (r_speeds.integer < 2 || !r_timereport_active)
                return;
 
        qglFinish();
@@ -1077,7 +1077,7 @@ void SHOWLMP_drawall(void)
        int i;
        for (i = 0;i < SHOWLMP_MAXLABELS;i++)
                if (showlmp[i].isactive)
-                       DrawQ_Pic(showlmp[i].x, showlmp[i].y, Draw_CachePic(showlmp[i].pic, false), 0, 0, 1, 1, 1, 1, 0);
+                       DrawQ_Pic(showlmp[i].x, showlmp[i].y, Draw_CachePic(showlmp[i].pic, true), 0, 0, 1, 1, 1, 1, 0);
 }
 
 void SHOWLMP_clear(void)
@@ -1291,11 +1291,11 @@ void SCR_UpdateLoadingScreen (void)
        float x, y;
        cachepic_t *pic;
        rmeshstate_t m;
+       float vertex3f[12];
+       float texcoord2f[8];
        // don't do anything if not initialized yet
        if (vid_hidden)
                return;
-       r_showtrispass = 0;
-       VID_UpdateGamma(false);
        qglViewport(0, 0, vid.width, vid.height);
        //qglDisable(GL_SCISSOR_TEST);
        //qglDepthMask(1);
@@ -1310,25 +1310,26 @@ void SCR_UpdateLoadingScreen (void)
        R_Mesh_Start();
        R_Mesh_Matrix(&identitymatrix);
        // draw the loading plaque
-       pic = Draw_CachePic("gfx/loading", false);
+       pic = Draw_CachePic("gfx/loading", true);
        x = (vid_conwidth.integer - pic->width)/2;
        y = (vid_conheight.integer - pic->height)/2;
        GL_Color(1,1,1,1);
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        GL_DepthTest(false);
        memset(&m, 0, sizeof(m));
-       m.pointer_vertex = varray_vertex3f;
-       m.pointer_texcoord[0] = varray_texcoord2f[0];
+       m.pointer_vertex = vertex3f;
+       m.pointer_texcoord[0] = texcoord2f;
        m.tex[0] = R_GetTexture(pic->tex);
        R_Mesh_State(&m);
-       varray_vertex3f[0] = varray_vertex3f[9] = x;
-       varray_vertex3f[1] = varray_vertex3f[4] = y;
-       varray_vertex3f[3] = varray_vertex3f[6] = x + pic->width;
-       varray_vertex3f[7] = varray_vertex3f[10] = y + pic->height;
-       varray_texcoord2f[0][0] = 0;varray_texcoord2f[0][1] = 0;
-       varray_texcoord2f[0][2] = 1;varray_texcoord2f[0][3] = 0;
-       varray_texcoord2f[0][4] = 1;varray_texcoord2f[0][5] = 1;
-       varray_texcoord2f[0][6] = 0;varray_texcoord2f[0][7] = 1;
+       vertex3f[2] = vertex3f[5] = vertex3f[8] = vertex3f[11] = 0;
+       vertex3f[0] = vertex3f[9] = x;
+       vertex3f[1] = vertex3f[4] = y;
+       vertex3f[3] = vertex3f[6] = x + pic->width;
+       vertex3f[7] = vertex3f[10] = y + pic->height;
+       texcoord2f[0] = 0;texcoord2f[1] = 0;
+       texcoord2f[2] = 1;texcoord2f[3] = 0;
+       texcoord2f[4] = 1;texcoord2f[5] = 1;
+       texcoord2f[6] = 0;texcoord2f[7] = 1;
        R_Mesh_Draw(0, 4, 2, polygonelements);
        R_Mesh_Finish();
        // refresh
@@ -1403,15 +1404,11 @@ void CL_UpdateScreen(void)
        if (r_timereport_active)
                R_TimeReport("other");
 
-       VID_UpdateGamma(false);
-
        SCR_SetUpToDrawConsole();
 
        if (r_timereport_active)
                R_TimeReport("start");
 
-       r_showtrispass = 0;
-
        CHECKGLERROR
        qglViewport(0, 0, vid.width, vid.height);
        qglDisable(GL_SCISSOR_TEST);