diff options
| author | Willem Jan Palenstijn | 2009-10-05 09:23:59 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-10-05 09:23:59 +0000 |
| commit | 4478ab647277d7eaa6eb52042f1be82e8f1cc5f1 (patch) | |
| tree | 7ecf703f486f0c03b37a7739fc2a1a3d0f8c48c1 | |
| parent | d37f4ea07d110994bb8e3b2897263213fd33c142 (diff) | |
| download | scummvm-rg350-4478ab647277d7eaa6eb52042f1be82e8f1cc5f1.tar.gz scummvm-rg350-4478ab647277d7eaa6eb52042f1be82e8f1cc5f1.tar.bz2 scummvm-rg350-4478ab647277d7eaa6eb52042f1be82e8f1cc5f1.zip | |
SCI: Name argument
svn-id: r44656
| -rw-r--r-- | engines/sci/gui/gui.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/gui/gui_windowmgr.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/gui/gui_windowmgr.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp index 432d50a9b4..2baf08c43f 100644 --- a/engines/sci/gui/gui.cpp +++ b/engines/sci/gui/gui.cpp @@ -110,9 +110,9 @@ reg_t SciGui::newWindow(Common::Rect dims, Common::Rect restoreRect, uint16 styl 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); diff --git a/engines/sci/gui/gui_windowmgr.cpp b/engines/sci/gui/gui_windowmgr.cpp index b66f6ffee0..ab355ba741 100644 --- a/engines/sci/gui/gui_windowmgr.cpp +++ b/engines/sci/gui/gui_windowmgr.cpp @@ -63,7 +63,7 @@ SciGuiWindowMgr::SciGuiWindowMgr(EngineState *state, SciGuiGfx *gfx) _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 @@ void SciGuiWindowMgr::EndUpdate(GuiWindow *wnd) { _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 @@ GuiWindow *SciGuiWindowMgr::NewWindow(const Common::Rect &dims, const Common::Re 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); diff --git a/engines/sci/gui/gui_windowmgr.h b/engines/sci/gui/gui_windowmgr.h index c34ce906ed..c7c9ebfd91 100644 --- a/engines/sci/gui/gui_windowmgr.h +++ b/engines/sci/gui/gui_windowmgr.h @@ -39,7 +39,7 @@ public: 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); |