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

[wjpalenstijn at users.sourceforge.net]

Revision: 44656
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44656&view=rev
Author:   wjpalenstijn
Date:     2009-10-05 09:23:59 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
SCI: Name argument

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

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-05 09:20:55 UTC (rev 44655)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-05 09:23:59 UTC (rev 44656)
@@ -110,9 +110,9 @@
 	GuiWindow *wnd = NULL;
 
 	if (restoreRect.top != 0 && restoreRect.left != 0 && restoreRect.height() != 0 && restoreRect.width() != 0)
-		wnd = _windowMgr->NewWindow(dims, &restoreRect, title, style, priority, 0);
+		wnd = _windowMgr->NewWindow(dims, &restoreRect, title, style, priority, false);
 	else
-		wnd = _windowMgr->NewWindow(dims, NULL, title, style, priority, 0);
+		wnd = _windowMgr->NewWindow(dims, NULL, title, style, priority, false);
 	wnd->penClr = colorPen;
 	wnd->backClr = colorBack;
 	_windowMgr->DrawWindow(wnd);

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-05 09:20:55 UTC (rev 44655)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-05 09:23:59 UTC (rev 44656)
@@ -63,7 +63,7 @@
 
 	_windowList.push_front(_wmgrPort);
 
-	_picWind = NewWindow(Common::Rect(0, 10, 320, 200), 0, 0, kTransparent | kNoFrame, 0, 1);
+	_picWind = NewWindow(Common::Rect(0, 10, 320, 200), 0, 0, kTransparent | kNoFrame, 0, true);
 }
 
 SciGuiWindowMgr::~SciGuiWindowMgr() {
@@ -101,7 +101,7 @@
 	_gfx->SetPort(oldPort);
 }
 
-GuiWindow *SciGuiWindowMgr::NewWindow(const Common::Rect &dims, const Common::Rect *restoreRect, const char *title, uint16 style, uint16 arg8, uint16 argA) {
+GuiWindow *SciGuiWindowMgr::NewWindow(const Common::Rect &dims, const Common::Rect *restoreRect, const char *title, uint16 style, uint16 arg8, bool draw) {
 	// Find an unused window/port id
 	uint id = 1;
 	while (id < _windowsById.size() && _windowsById[id]) {
@@ -173,7 +173,7 @@
 	if (restoreRect == 0)
 		pwnd->restoreRect = pwnd->dims;
 	
-	if (argA)
+	if (draw)
 		DrawWindow(pwnd);
 	_gfx->SetPort((GuiPort *)pwnd);
 	_gfx->SetOrigin(pwnd->rect.left, pwnd->rect.top + _wmgrPort->top);

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.h	2009-10-05 09:20:55 UTC (rev 44655)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.h	2009-10-05 09:23:59 UTC (rev 44656)
@@ -39,7 +39,7 @@
 	int16 isFrontWindow(GuiWindow *wnd);
 	void BeginUpdate(GuiWindow *wnd);
 	void EndUpdate(GuiWindow *wnd);
-	GuiWindow *NewWindow(const Common::Rect &dims, const Common::Rect *restoreRect, const char *title, uint16 style, uint16 arg8, uint16 argA);
+	GuiWindow *NewWindow(const Common::Rect &dims, const Common::Rect *restoreRect, const char *title, uint16 style, uint16 arg8, bool draw);
 	void DrawWindow(GuiWindow *wnd);
 	void DisposeWindow(GuiWindow *pWnd, int16 arg2);
 	void UpdateWindow(GuiWindow *wnd);


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