Fixed netgraph breaking transparent console. Also made netgraph itself

transparent, and put it 'behind' the HUD.  See Bug#4.
This commit is contained in:
Jay Dolan 2006-01-07 20:41:07 +00:00
parent 03f8242b77
commit 86b52d275a

View file

@ -156,8 +156,8 @@ void SCR_DrawDebugGraph (void)
x = scr_vrect.x; x = scr_vrect.x;
y = scr_vrect.y+scr_vrect.height; y = scr_vrect.y+scr_vrect.height;
re.DrawFill (x, y-scr_graphheight->value, //re.DrawFill (x, y-scr_graphheight->value,
w, scr_graphheight->value, 8); //w, scr_graphheight->value, 8);
for (a=0 ; a<w ; a++) for (a=0 ; a<w ; a++)
{ {
@ -418,7 +418,7 @@ void SCR_Init (void)
scr_netgraph = Cvar_Get ("netgraph", "0", 0); scr_netgraph = Cvar_Get ("netgraph", "0", 0);
scr_timegraph = Cvar_Get ("timegraph", "0", 0); scr_timegraph = Cvar_Get ("timegraph", "0", 0);
scr_debuggraph = Cvar_Get ("debuggraph", "0", 0); scr_debuggraph = Cvar_Get ("debuggraph", "0", 0);
scr_graphheight = Cvar_Get ("graphheight", "32", 0); scr_graphheight = Cvar_Get ("graphheight", "24", 0);
scr_graphscale = Cvar_Get ("graphscale", "1", 0); scr_graphscale = Cvar_Get ("graphscale", "1", 0);
scr_graphshift = Cvar_Get ("graphshift", "0", 0); scr_graphshift = Cvar_Get ("graphshift", "0", 0);
scr_drawall = Cvar_Get ("scr_drawall", "0", 0); scr_drawall = Cvar_Get ("scr_drawall", "0", 0);
@ -1366,6 +1366,12 @@ void SCR_UpdateScreen (void)
V_RenderView ( separation[i] ); V_RenderView ( separation[i] );
if (scr_timegraph->value) //update and draw netgraph behind everything else
SCR_DebugGraph (cls.frametime*300, 0);
if (scr_debuggraph->value || scr_timegraph->value || scr_netgraph->value)
SCR_DrawDebugGraph ();
SCR_DrawStats (); SCR_DrawStats ();
if (cl.frame.playerstate.stats[STAT_LAYOUTS] & 1) if (cl.frame.playerstate.stats[STAT_LAYOUTS] & 1)
SCR_DrawLayout (); SCR_DrawLayout ();
@ -1385,16 +1391,10 @@ void SCR_UpdateScreen (void)
DrawString(viddef.width-64,0,s); DrawString(viddef.width-64,0,s);
} }
if (scr_timegraph->value) SCR_DrawConsole ();
SCR_DebugGraph (cls.frametime*300, 0);
if (scr_debuggraph->value || scr_timegraph->value || scr_netgraph->value)
SCR_DrawDebugGraph ();
SCR_DrawPause (); SCR_DrawPause ();
SCR_DrawConsole ();
M_Draw (); M_Draw ();
SCR_DrawLoading (); SCR_DrawLoading ();