X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_screen.c;h=8e727ecf0cbb0c90757bfa9408dea897ef8304fe;hb=77910438ddc95fa06a4ef90c5f915ba36f0d9a77;hp=9ccbfd67d3d0f2f529b5c97cb4dbb608f46544e7;hpb=8022854493e5595b924ed2d573255bff8faf6d4f;p=xonotic%2Fdarkplaces.git diff --git a/cl_screen.c b/cl_screen.c index 9ccbfd67..8e727ecf 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -621,7 +621,7 @@ void SCR_SetUpToDrawConsole (void) if (scr_menuforcewhiledisconnected.integer && key_dest == key_game && cls.state == ca_disconnected) { if (framecounter >= 2) - MR_ToggleMenu_f(); + MR_ToggleMenu(1); else framecounter++; } @@ -1551,8 +1551,6 @@ void SCR_DrawScreen (void) R_Mesh_Start(); - R_TimeReport_BeginFrame(); - R_UpdateVariables(); // Quake uses clockwise winding, so these are swapped @@ -1703,7 +1701,10 @@ void SCR_DrawScreen (void) R_TimeReport("2d"); if (cls.signon == SIGNONS) + { R_TimeReport_EndFrame(); + R_TimeReport_BeginFrame(); + } DrawQ_Finish(); @@ -1757,7 +1758,7 @@ static void SCR_SetLoadingScreenTexture(void) loadingscreentexture_h = vid.height / (float) h; } - loadingscreentexture = R_LoadTexture2D(r_main_texturepool, "loadingscreentexture", w, h, NULL, TEXTYPE_BGRA, TEXF_FORCENEAREST | TEXF_CLAMP, NULL); + loadingscreentexture = R_LoadTexture2D(r_main_texturepool, "loadingscreentexture", w, h, NULL, TEXTYPE_COLORBUFFER, TEXF_FORCENEAREST | TEXF_CLAMP, NULL); R_Mesh_CopyToTexture(loadingscreentexture, 0, 0, 0, 0, vid.width, vid.height); loadingscreentexture_vertex3f[2] = loadingscreentexture_vertex3f[5] = loadingscreentexture_vertex3f[8] = loadingscreentexture_vertex3f[11] = 0;