From 060980c50272829151157477425fe0f1dc393a9a Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Wed, 14 Oct 2009 11:34:02 +0000 Subject: SCI/newgui: SciGuiTransitions receives SciGui now svn-id: r45071 --- engines/sci/gui/gui.cpp | 2 +- engines/sci/gui/gui_transitions.cpp | 4 ++-- engines/sci/gui/gui_transitions.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp index 7a63252a8d..f5cbf6b9ff 100644 --- a/engines/sci/gui/gui.cpp +++ b/engines/sci/gui/gui.cpp @@ -55,7 +55,7 @@ SciGui::SciGui(EngineState *state, SciGuiScreen *screen, SciGuiPalette *palette, : _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 diff --git a/engines/sci/gui/gui_transitions.cpp b/engines/sci/gui/gui_transitions.cpp index 6f9d0a313b..9983982415 100644 --- a/engines/sci/gui/gui_transitions.cpp +++ b/engines/sci/gui/gui_transitions.cpp @@ -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(); } diff --git a/engines/sci/gui/gui_transitions.h b/engines/sci/gui/gui_transitions.h index 2cc2757edc..b2b9d183ea 100644 --- a/engines/sci/gui/gui_transitions.h +++ b/engines/sci/gui/gui_transitions.h @@ -33,7 +33,7 @@ namespace Sci { 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 @@ public: private: void init(void); + SciGui *_gui; SciGuiScreen *_screen; SciGuiPalette *_palette; -- cgit v1.2.3