X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=17213e566db0be1d09e6ca02d42d9e59f1cf59f2;hb=356739cd8e8878e6e0ec488d473389aa1ffc92b4;hp=189ddd18c0b03753cb293c87c4a9948ee29cceed;hpb=91ab37429970c4ee5373ec8a38e8b4f6c531f2fa;p=xonotic%2Fdarkplaces.git diff --git a/gl_draw.c b/gl_draw.c index 189ddd18..17213e56 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -1018,7 +1018,7 @@ static void gl_draw_start(void) LoadFont(false, va(vabuf, sizeof(vabuf), "gfx/font_%s", dp_fonts.f[i].title), &dp_fonts.f[i], 1, 0); // draw the loading screen so people have something to see in the newly opened window - SCR_UpdateLoadingScreen(true); + SCR_UpdateLoadingScreen(true, true); } static void gl_draw_shutdown(void) @@ -1931,10 +1931,10 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height width = pic->width; if (height == 0) height = pic->height; - R_SetupShader_Generic(Draw_GetPicTexture(pic), NULL, GL_MODULATE, 1, (flags & (DRAWFLAGS_BLEND+DRAWFLAG_NOGAMMA)) ? false : true, true, false); + R_SetupShader_Generic(Draw_GetPicTexture(pic), NULL, GL_MODULATE, 1, (flags & (DRAWFLAGS_BLEND | DRAWFLAG_NOGAMMA)) ? false : true, true, false); } else - R_SetupShader_Generic_NoTexture((flags & (DRAWFLAGS_BLEND+DRAWFLAG_NOGAMMA)) ? false : true, true); + R_SetupShader_Generic_NoTexture((flags & (DRAWFLAGS_BLEND | DRAWFLAG_NOGAMMA)) ? false : true, true); floats[2] = floats[5] = floats[8] = floats[11] = 0; floats[0] = floats[9] = x;