[Scummvm-cvs-logs] SF.net SVN: scummvm:[45222] scummvm/trunk/engines/sci/gui

[m_kiewitz at users.sourceforge.net]

Revision: 45222
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45222&view=rev
Author:   m_kiewitz
Date:     2009-10-18 13:47:42 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
SCI/newgui: Window manager cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_helpers.h
    scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_helpers.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_helpers.h	2009-10-18 12:47:54 UTC (rev 45221)
+++ scummvm/trunk/engines/sci/gui/gui_helpers.h	2009-10-18 13:47:42 UTC (rev 45222)
@@ -61,14 +61,14 @@
 	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) {
 	}

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-18 12:47:54 UTC (rev 45221)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-18 13:47:42 UTC (rev 45222)
@@ -136,7 +136,7 @@
 	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 @@
 	_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::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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.