mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-13 07:47:45 +00:00
Small cleanup
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@868 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
95eafd7427
commit
90bd03f65e
3 changed files with 22 additions and 7 deletions
|
@ -1807,9 +1807,6 @@ void SCR_DrawTwoDimensional(int uimenu, qboolean nohud)
|
||||||
//
|
//
|
||||||
// draw any areas not covered by the refresh
|
// draw any areas not covered by the refresh
|
||||||
//
|
//
|
||||||
if (!nohud)
|
|
||||||
SCR_TileClear ();
|
|
||||||
|
|
||||||
#ifdef RGLQUAKE
|
#ifdef RGLQUAKE
|
||||||
if (r_netgraph.value)
|
if (r_netgraph.value)
|
||||||
GLR_NetGraph ();
|
GLR_NetGraph ();
|
||||||
|
|
|
@ -277,6 +277,9 @@ void GLSCR_UpdateScreen (void)
|
||||||
|
|
||||||
GLR_BrightenScreen();
|
GLR_BrightenScreen();
|
||||||
|
|
||||||
|
if (!nohud)
|
||||||
|
SCR_TileClear ();
|
||||||
|
|
||||||
SCR_DrawTwoDimensional(uimenu, nohud);
|
SCR_DrawTwoDimensional(uimenu, nohud);
|
||||||
|
|
||||||
GLV_UpdatePalette ();
|
GLV_UpdatePalette ();
|
||||||
|
|
|
@ -52,6 +52,7 @@ needs almost the entire 256k of stack space!
|
||||||
*/
|
*/
|
||||||
void SWSCR_UpdateScreen (void)
|
void SWSCR_UpdateScreen (void)
|
||||||
{
|
{
|
||||||
|
qboolean nohud;
|
||||||
int uimenu;
|
int uimenu;
|
||||||
vrect_t vrect;
|
vrect_t vrect;
|
||||||
|
|
||||||
|
@ -145,18 +146,31 @@ void SWSCR_UpdateScreen (void)
|
||||||
|
|
||||||
D_DisableBackBufferAccess (); // for adapters that can't stay mapped in
|
D_DisableBackBufferAccess (); // for adapters that can't stay mapped in
|
||||||
// for linear writes all the time
|
// for linear writes all the time
|
||||||
|
|
||||||
|
nohud = true;
|
||||||
#ifdef TEXTEDIT
|
#ifdef TEXTEDIT
|
||||||
if (!editormodal) //don't render view.
|
if (!editormodal) //don't render view.
|
||||||
#endif
|
#endif
|
||||||
if (cl.worldmodel)
|
|
||||||
{
|
{
|
||||||
VID_LockBuffer ();
|
#ifdef CSQC_DAT
|
||||||
V_RenderView ();
|
if (CSQC_DrawView())
|
||||||
VID_UnlockBuffer ();
|
nohud = true;
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (cl.worldmodel)
|
||||||
|
{
|
||||||
|
VID_LockBuffer ();
|
||||||
|
V_RenderView ();
|
||||||
|
VID_UnlockBuffer ();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
D_EnableBackBufferAccess (); // of all overlay stuff if drawing directly
|
D_EnableBackBufferAccess (); // of all overlay stuff if drawing directly
|
||||||
|
|
||||||
|
#if 1
|
||||||
|
SCR_DrawTwoDimensional(uimenu, nohud);
|
||||||
|
#else
|
||||||
if (scr_drawloading)
|
if (scr_drawloading)
|
||||||
{
|
{
|
||||||
SCR_DrawLoading ();
|
SCR_DrawLoading ();
|
||||||
|
@ -207,6 +221,7 @@ void SWSCR_UpdateScreen (void)
|
||||||
SCR_DrawConsole (false);
|
SCR_DrawConsole (false);
|
||||||
M_Draw (uimenu);
|
M_Draw (uimenu);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
D_DisableBackBufferAccess (); // for adapters that can't stay mapped in
|
D_DisableBackBufferAccess (); // for adapters that can't stay mapped in
|
||||||
|
|
Loading…
Reference in a new issue