diff options
| author | Martin Kiewitz | 2009-10-18 13:47:42 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-10-18 13:47:42 +0000 |
| commit | dc1637b6fb57d6b3e0af7798f7caf062f07e6de5 (patch) | |
| tree | 326606e72b5b00818f845e02fdc01a8f85da215a /engines | |
| parent | 8b993ce86381352e022641896fd28f3472f083bf (diff) | |
| download | scummvm-rg350-dc1637b6fb57d6b3e0af7798f7caf062f07e6de5.tar.gz scummvm-rg350-dc1637b6fb57d6b3e0af7798f7caf062f07e6de5.tar.bz2 scummvm-rg350-dc1637b6fb57d6b3e0af7798f7caf062f07e6de5.zip | |
SCI/newgui: Window manager cleanup
svn-id: r45222
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/gui/gui_helpers.h | 4 | ||||
| -rw-r--r-- | engines/sci/gui/gui_windowmgr.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/gui/gui_helpers.h b/engines/sci/gui/gui_helpers.h index cc4ac961e6..c7ad8d8a33 100644 --- a/engines/sci/gui/gui_helpers.h +++ b/engines/sci/gui/gui_helpers.h @@ -61,14 +61,14 @@ struct GuiWindow : public GuiPort { Common::Rect dims; // client area of window Common::Rect restoreRect; // total area of window including borders uint16 wndStyle; - uint16 uSaveFlag; + uint16 saveScreenMask; reg_t hSaved1; reg_t hSaved2; Common::String title; bool bDrawn; GuiWindow(uint16 theId) : GuiPort(theId), - wndStyle(0), uSaveFlag(0), + wndStyle(0), saveScreenMask(0), hSaved1(NULL_REG), hSaved2(NULL_REG), bDrawn(false) { } diff --git a/engines/sci/gui/gui_windowmgr.cpp b/engines/sci/gui/gui_windowmgr.cpp index d58d2d677c..664cf751f4 100644 --- a/engines/sci/gui/gui_windowmgr.cpp +++ b/engines/sci/gui/gui_windowmgr.cpp @@ -136,7 +136,7 @@ GuiWindow *SciGuiWindowMgr::NewWindow(const Common::Rect &dims, const Common::Re pwnd->hSaved1 = pwnd->hSaved2 = NULL_REG; pwnd->bDrawn = false; if ((style & SCI_WINDOWMGR_STYLE_TRANSPARENT) == 0) - pwnd->uSaveFlag = (priority == -1 ? SCI_SCREEN_MASK_VISUAL : SCI_SCREEN_MASK_VISUAL | SCI_SCREEN_MASK_PRIORITY); + pwnd->saveScreenMask = (priority == -1 ? SCI_SCREEN_MASK_VISUAL : SCI_SCREEN_MASK_VISUAL | SCI_SCREEN_MASK_PRIORITY); if (title && (style & SCI_WINDOWMGR_STYLE_TITLE)) { pwnd->title = title; @@ -200,8 +200,8 @@ void SciGuiWindowMgr::DrawWindow(GuiWindow *pWnd) { _gfx->PenColor(0); if ((wndStyle & SCI_WINDOWMGR_STYLE_TRANSPARENT) == 0) { pWnd->hSaved1 = _gfx->BitsSave(pWnd->restoreRect, SCI_SCREEN_MASK_VISUAL); - if (pWnd->uSaveFlag & 2) { - pWnd->hSaved2 = _gfx->BitsSave(pWnd->restoreRect, 2); + if (pWnd->saveScreenMask & SCI_SCREEN_MASK_PRIORITY) { + pWnd->hSaved2 = _gfx->BitsSave(pWnd->restoreRect, SCI_SCREEN_MASK_PRIORITY); if ((wndStyle & SCI_WINDOWMGR_STYLE_USER) == 0) _gfx->FillRect(pWnd->restoreRect, SCI_SCREEN_MASK_PRIORITY, 0, 15); } @@ -259,11 +259,11 @@ void SciGuiWindowMgr::DisposeWindow(GuiWindow *pWnd, int16 arg2) { void SciGuiWindowMgr::UpdateWindow(GuiWindow *wnd) { GuiMemoryHandle handle; - if (wnd->uSaveFlag && wnd->bDrawn) { + if (wnd->saveScreenMask && wnd->bDrawn) { handle = _gfx->BitsSave(wnd->restoreRect, SCI_SCREEN_MASK_VISUAL); _gfx->BitsRestore(wnd->hSaved1); wnd->hSaved1 = handle; - if (wnd->uSaveFlag & SCI_SCREEN_MASK_PRIORITY) { + if (wnd->saveScreenMask & SCI_SCREEN_MASK_PRIORITY) { handle = _gfx->BitsSave(wnd->restoreRect, SCI_SCREEN_MASK_PRIORITY); _gfx->BitsRestore(wnd->hSaved2); wnd->hSaved2 = handle; |