nzp-team/quakespasm
0
0
Fork 0
mirror of https://github.com/nzp-team/quakespasm.git synced 2024-11-25 21:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10 from ScatterBox/main

Browse source
This commit is contained in:
Ian 2023-01-15 16:33:27 -05:00 committed by GitHub
commit 5f95f88e82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/console.c
View file

@ -1200,14 +1200,14 @@ void Con_DrawConsole (int lines, qboolean drawinput)
return;
con_vislines = lines * vid.conheight / glheight;
GL_SetCanvas (CANVAS_CONSOLE);
//GL_SetCanvas (CANVAS_CONSOLE);
// draw the background
Draw_ConsoleBackground ();
if (!console_enabled && !developer.value)
return;
Draw_ConsoleBackground ();
// draw the buffer text
rows = (con_vislines +7)/8;

4
source/gl_draw.c
View file

@ -863,9 +863,9 @@ Draw_ConsoleBackground -- johnfitz -- rewritten
void Draw_ConsoleBackground (void)
{
//GL_SetCanvas (CANVAS_CONSOLE); //in case this is called from weird places
GL_SetCanvas (CANVAS_CONSOLE); //in case this is called from weird places
Draw_FillByColor (0, 0, vid.conwidth, vid.conheight, 0, 0, 0, 0);
Draw_FillByColor (0, 0, vid.conwidth, vid.conheight, 1, 1, 1, 200);
}
/*

64
source/gl_screen.c
View file

@ -1934,8 +1934,6 @@ int original_view_fov;
void SCR_UpdateScreen (void)
{
vid.numpages = (gl_triplebuffer.value) ? 3 : 2;
scr_copytop = 0;
//screen is disabled for loading, and we don't have any loading steps...?
if (scr_disabled_for_loading && !loading_num_step)
@ -1952,6 +1950,8 @@ void SCR_UpdateScreen (void)
if (!scr_initialized || !con_initialized)
return; // not initialized yet
scr_copytop = 0;
GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
@ -2041,22 +2041,50 @@ void SCR_UpdateScreen (void)
//FIXME: only call this when needed
SCR_TileClear ();
SCR_DrawCrosshair (); //johnfitz
SCR_DrawRam ();
SCR_DrawNet ();
SCR_DrawTurtle ();
SCR_DrawPause ();
SCR_CheckDrawCenterString ();
SCR_CheckDrawUseString ();
SCR_DrawDevStats (); //johnfitz
HUD_Draw ();
SCR_DrawFPS (); //johnfitz
SCR_DrawClock (); //johnfitz
SCR_DrawConsole ();
M_Draw ();
if(scr_loadscreen.value)
SCR_DrawLoadScreen();
if (scr_drawdialog) //new game confirm
{
if (con_forcedup)
Draw_ConsoleBackground ();
// else
// Sbar_Draw ();
Draw_FadeScreen ();
SCR_DrawNotifyString ();
}
else if (scr_drawloading) //loading
{
SCR_DrawLoading ();
// Sbar_Draw ();
}
else if (cl.intermission == 1 && key_dest == key_game) //end of level
{
Sbar_IntermissionOverlay ();
}
else if (cl.intermission == 2 && key_dest == key_game) //end of episode
{
Sbar_FinaleOverlay ();
SCR_CheckDrawCenterString ();
}
else
{
SCR_DrawCrosshair (); //johnfitz
SCR_DrawRam ();
SCR_DrawNet ();
SCR_DrawTurtle ();
SCR_DrawPause ();
SCR_CheckDrawCenterString ();
SCR_CheckDrawUseString ();
SCR_DrawDevStats (); //johnfitz
HUD_Draw ();
SCR_DrawFPS (); //johnfitz
SCR_DrawClock (); //johnfitz
SCR_DrawConsole ();
M_Draw ();
if(scr_loadscreen.value)
{
SCR_DrawLoadScreen();
}
}
Draw_LoadingFill();