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

[m_kiewitz at users.sourceforge.net]

Revision: 45071
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45071&view=rev
Author:   m_kiewitz
Date:     2009-10-14 11:34:02 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
SCI/newgui: SciGuiTransitions receives SciGui now

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

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-14 11:29:09 UTC (rev 45070)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-14 11:34:02 UTC (rev 45071)
@@ -55,7 +55,7 @@
 	: _s(state), _screen(screen), _palette(palette), _cursor(cursor) {
 
 	_gfx = new SciGuiGfx(_s, _screen, _palette);
-	_transitions = new SciGuiTransitions(_screen, _palette);
+	_transitions = new SciGuiTransitions(this, _screen, _palette);
 	_animate = new SciGuiAnimate(_s, _gfx, _screen, _palette);
 	_windowMgr = new SciGuiWindowMgr(_screen, _gfx, _animate);
 //  	_gui32 = new SciGui32(_s, _screen, _palette, _cursor); // for debug purposes

Modified: scummvm/trunk/engines/sci/gui/gui_transitions.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-14 11:29:09 UTC (rev 45070)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-14 11:34:02 UTC (rev 45071)
@@ -36,8 +36,8 @@
 
 namespace Sci {
 
-SciGuiTransitions::SciGuiTransitions(SciGuiScreen *screen, SciGuiPalette *palette)
-	: _screen(screen), _palette(palette) {
+SciGuiTransitions::SciGuiTransitions(SciGui *gui, SciGuiScreen *screen, SciGuiPalette *palette)
+	: _gui(gui), _screen(screen), _palette(palette) {
 	init();
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui_transitions.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_transitions.h	2009-10-14 11:29:09 UTC (rev 45070)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.h	2009-10-14 11:34:02 UTC (rev 45071)
@@ -33,7 +33,7 @@
 class SciGuiScreen;
 class SciGuiTransitions {
 public:
-	SciGuiTransitions(SciGuiScreen *screen, SciGuiPalette *palette);
+	SciGuiTransitions(SciGui *gui, SciGuiScreen *screen, SciGuiPalette *palette);
 	~SciGuiTransitions();
 
 	void setup(int16 number);
@@ -42,6 +42,7 @@
 private:
 	void init(void);
 
+	SciGui *_gui;
 	SciGuiScreen *_screen;
 	SciGuiPalette *_palette;
 


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