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

[thebluegr at users.sourceforge.net]

Revision: 44933
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44933&view=rev
Author:   thebluegr
Date:     2009-10-11 16:15:42 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
Stop passing the engine state to SciGuiWindowMgr

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-11 16:12:24 UTC (rev 44932)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-11 16:15:42 UTC (rev 44933)
@@ -53,7 +53,7 @@
 	: _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
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-11 16:12:24 UTC (rev 44932)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-11 16:15:42 UTC (rev 44933)
@@ -43,8 +43,8 @@
 	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);

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.h	2009-10-11 16:12:24 UTC (rev 44932)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.h	2009-10-11 16:15:42 UTC (rev 44933)
@@ -33,7 +33,7 @@
 
 class SciGuiWindowMgr {
 public:
-	SciGuiWindowMgr(EngineState *state, SciGuiScreen *screen, SciGuiGfx *gfx);
+	SciGuiWindowMgr(SciGuiScreen *screen, SciGuiGfx *gfx);
 	~SciGuiWindowMgr();
 
 	int16 isFrontWindow(GuiWindow *wnd);
@@ -52,7 +52,6 @@
 private:
 	typedef Common::List<GuiPort *> PortList;
 
-	EngineState *_s;
 	SciGuiScreen *_screen;
 	SciGuiGfx *_gfx;
 


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