- Moved all BorderNeedRefresh and SB_state updating code into separate functions that won't crash if screen is NULL.

SVN r4167 (trunk)
This commit is contained in:
Randy Heit 2013-02-27 03:10:25 +00:00
commit be0845acf1
22 changed files with 85 additions and 45 deletions

View file

@ -53,6 +53,7 @@
#include "gi.h"
#include "g_level.h"
#include "st_stuff.h"
#include "sbar.h"
#include "i_system.h"
#include "i_video.h"
@ -1377,8 +1378,32 @@ bool DCanvas::ClipBox (int &x, int &y, int &w, int &h, const BYTE *&src, const i
return false;
}
//==========================================================================
//
// V_SetBorderNeedRefresh
//
// Flag the border as in need of updating. (Probably because something that
// was on top of it has changed.
//
//==========================================================================
void V_SetBorderNeedRefresh()
{
if (screen != NULL)
{
BorderNeedRefresh = screen->GetPageCount();
}
}
//==========================================================================
//
// V_DrawFrame
//
// Draw a frame around the specified area using the view border
// frame graphics. The border is drawn outside the area, not in it.
//
//==========================================================================
void V_DrawFrame (int left, int top, int width, int height)
{
FTexture *p;
@ -1411,7 +1436,7 @@ void V_DrawFrame (int left, int top, int width, int height)
//==========================================================================
//
//
// V_DrawBorder
//
//==========================================================================
@ -1455,7 +1480,7 @@ static void V_DrawViewBorder (void)
// Will draw borders around itself, too.
if (SCREENWIDTH > 320)
{
SB_state = screen->GetPageCount ();
ST_SetNeedRefresh();
}
if (viewwidth == SCREENWIDTH)