diff options
author | Filippos Karapetis | 2009-10-11 16:15:42 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-10-11 16:15:42 +0000 |
commit | 1d2031defd094f0b067634c42c864c2143a6b341 (patch) | |
tree | a8b30017e5fe652350ed1aa3e9582376c1468a66 | |
parent | 0da0d5b6a418b6205a1b228c32efbd6433e5b125 (diff) | |
download | scummvm-rg350-1d2031defd094f0b067634c42c864c2143a6b341.tar.gz scummvm-rg350-1d2031defd094f0b067634c42c864c2143a6b341.tar.bz2 scummvm-rg350-1d2031defd094f0b067634c42c864c2143a6b341.zip |
Stop passing the engine state to SciGuiWindowMgr
svn-id: r44933
-rw-r--r-- | engines/sci/gui/gui.cpp | 2 | ||||
-rw-r--r-- | engines/sci/gui/gui_windowmgr.cpp | 4 | ||||
-rw-r--r-- | engines/sci/gui/gui_windowmgr.h | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp index 096688653e..f1dfee166a 100644 --- a/engines/sci/gui/gui.cpp +++ b/engines/sci/gui/gui.cpp @@ -53,7 +53,7 @@ SciGui::SciGui(EngineState *state, SciGuiScreen *screen, SciGuiPalette *palette, : _s(state), _screen(screen), _palette(palette), _cursor(cursor) { _gfx = new SciGuiGfx(_s, _screen, _palette); - _windowMgr = new SciGuiWindowMgr(_s, _screen, _gfx); + _windowMgr = new SciGuiWindowMgr(_screen, _gfx); // _gui32 = new SciGui32(_s, _screen, _palette, _cursor); // for debug purposes } diff --git a/engines/sci/gui/gui_windowmgr.cpp b/engines/sci/gui/gui_windowmgr.cpp index b9e0590ef5..46f3895a84 100644 --- a/engines/sci/gui/gui_windowmgr.cpp +++ b/engines/sci/gui/gui_windowmgr.cpp @@ -43,8 +43,8 @@ enum { SCI_WINDOWMGR_STYLE_USER = (1 << 7) }; -SciGuiWindowMgr::SciGuiWindowMgr(EngineState *state, SciGuiScreen *screen, SciGuiGfx *gfx) - : _s(state), _screen(screen), _gfx(gfx) { +SciGuiWindowMgr::SciGuiWindowMgr(SciGuiScreen *screen, SciGuiGfx *gfx) + : _screen(screen), _gfx(gfx) { _wmgrPort = new GuiPort(1); _windowsById.resize(2); diff --git a/engines/sci/gui/gui_windowmgr.h b/engines/sci/gui/gui_windowmgr.h index 5b0c0c1510..da0576f2e2 100644 --- a/engines/sci/gui/gui_windowmgr.h +++ b/engines/sci/gui/gui_windowmgr.h @@ -33,7 +33,7 @@ namespace Sci { class SciGuiWindowMgr { public: - SciGuiWindowMgr(EngineState *state, SciGuiScreen *screen, SciGuiGfx *gfx); + SciGuiWindowMgr(SciGuiScreen *screen, SciGuiGfx *gfx); ~SciGuiWindowMgr(); int16 isFrontWindow(GuiWindow *wnd); @@ -52,7 +52,6 @@ public: private: typedef Common::List<GuiPort *> PortList; - EngineState *_s; SciGuiScreen *_screen; SciGuiGfx *_gfx; |