From b9bb7d95bbfeaa4c119fae045a736105da82614e Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 1 Feb 2012 20:06:14 +0900 Subject: [PATCH] Remove calls to Sbar_Changed from the libraries. If this breaks things, we'll have to sort something out, but again, no libs reaching into the exe. --- libs/video/renderer/gl/gl_draw.c | 2 -- libs/video/renderer/r_screen.c | 5 ----- libs/video/renderer/sw/screen.c | 1 - libs/video/renderer/sw32/screen.c | 1 - libs/video/targets/vid_3dfxsvga.c | 1 - libs/video/targets/vid_glx.c | 1 - libs/video/targets/vid_sgl.c | 1 - libs/video/targets/vid_wgl.c | 2 -- 8 files changed, 14 deletions(-) diff --git a/libs/video/renderer/gl/gl_draw.c b/libs/video/renderer/gl/gl_draw.c index 9eda9a59c..46c3b7848 100644 --- a/libs/video/renderer/gl/gl_draw.c +++ b/libs/video/renderer/gl/gl_draw.c @@ -891,8 +891,6 @@ Draw_FadeScreen (void) qfglEnd (); qfglColor3ubv (color_white); qfglEnable (GL_TEXTURE_2D); - - Sbar_Changed (); } static void diff --git a/libs/video/renderer/r_screen.c b/libs/video/renderer/r_screen.c index 6f31ad019..a82f19c3e 100644 --- a/libs/video/renderer/r_screen.c +++ b/libs/video/renderer/r_screen.c @@ -162,9 +162,6 @@ SCR_CalcRefdef (void) scr_fullupdate = 0; vid.recalc_refdef = 0; - // force the status bar to redraw - Sbar_Changed (); - // bound field of view Cvar_SetValue (scr_fov, bound (1, scr_fov->value, 170)); @@ -278,8 +275,6 @@ SCR_DrawPause (void) void SCR_SetUpToDrawConsole (void) { - if (clearconsole++ < vid.numpages) - Sbar_Changed (); } /* diff --git a/libs/video/renderer/sw/screen.c b/libs/video/renderer/sw/screen.c index 72024cc1c..bc28c18f9 100644 --- a/libs/video/renderer/sw/screen.c +++ b/libs/video/renderer/sw/screen.c @@ -223,7 +223,6 @@ SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs) if (scr_fullupdate++ < vid.numpages) { // clear the entire screen scr_copyeverything = 1; Draw_TileClear (0, 0, vid.width, vid.height); - Sbar_Changed (); } pconupdate = NULL; diff --git a/libs/video/renderer/sw32/screen.c b/libs/video/renderer/sw32/screen.c index 8f767b82c..4117c317f 100644 --- a/libs/video/renderer/sw32/screen.c +++ b/libs/video/renderer/sw32/screen.c @@ -177,7 +177,6 @@ SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs) if (scr_fullupdate++ < vid.numpages) { // clear the entire screen scr_copyeverything = 1; Draw_TileClear (0, 0, vid.width, vid.height); - Sbar_Changed (); } pconupdate = NULL; diff --git a/libs/video/targets/vid_3dfxsvga.c b/libs/video/targets/vid_3dfxsvga.c index 4b1be3387..e3e74820f 100644 --- a/libs/video/targets/vid_3dfxsvga.c +++ b/libs/video/targets/vid_3dfxsvga.c @@ -198,7 +198,6 @@ GL_EndRendering (void) { qfglFinish (); qf_fxMesaSwapBuffers (); - Sbar_Changed (); } static unsigned int resolutions[][3] = { diff --git a/libs/video/targets/vid_glx.c b/libs/video/targets/vid_glx.c index 15993e4e9..61dff54a3 100644 --- a/libs/video/targets/vid_glx.c +++ b/libs/video/targets/vid_glx.c @@ -183,7 +183,6 @@ GL_EndRendering (void) { qfglFinish (); qfglXSwapBuffers (x_disp, x_win); - Sbar_Changed (); } void diff --git a/libs/video/targets/vid_sgl.c b/libs/video/targets/vid_sgl.c index 1c3d9cb26..c041d4589 100644 --- a/libs/video/targets/vid_sgl.c +++ b/libs/video/targets/vid_sgl.c @@ -95,7 +95,6 @@ GL_EndRendering (void) { qfglFinish (); SDL_GL_SwapBuffers (); - Sbar_Changed (); } void diff --git a/libs/video/targets/vid_wgl.c b/libs/video/targets/vid_wgl.c index fee5086b3..47a5a8f38 100644 --- a/libs/video/targets/vid_wgl.c +++ b/libs/video/targets/vid_wgl.c @@ -373,8 +373,6 @@ GL_EndRendering (void) } } } - if (fullsbardraw) - Sbar_Changed (); } void