diff options
| author | Filippos Karapetis | 2009-10-30 18:32:55 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-10-30 18:32:55 +0000 |
| commit | 9e78f4693c0e2d270a17d18eba7cdbc1165f88b7 (patch) | |
| tree | d8898ed8bc40b66148168248a5a960025d5f0763 | |
| parent | e87808d89b4af208504a75809e5fa91fd61a367b (diff) | |
| download | scummvm-rg350-9e78f4693c0e2d270a17d18eba7cdbc1165f88b7.tar.gz scummvm-rg350-9e78f4693c0e2d270a17d18eba7cdbc1165f88b7.tar.bz2 scummvm-rg350-9e78f4693c0e2d270a17d18eba7cdbc1165f88b7.zip | |
Fixed a crash in the old graphics code from commit #45542
svn-id: r45544
| -rw-r--r-- | engines/sci/gui/gui.h | 2 | ||||
| -rw-r--r-- | engines/sci/gui32/gui32.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h index 26010e9d67..29d090c987 100644 --- a/engines/sci/gui/gui.h +++ b/engines/sci/gui/gui.h @@ -144,13 +144,13 @@ protected: EngineState *_s; SciGuiScreen *_screen; SciGuiPalette *_palette; + SciGuiGfx *_gfx; private: virtual void initPriorityBands(); virtual void animateShowPic(); virtual void addToPicSetPicNotValid(); - SciGuiGfx *_gfx; SciGuiWindowMgr *_windowMgr; SciGuiAnimate *_animate; SciGuiControls *_controls; diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp index 46d3df98cb..233df2478b 100644 --- a/engines/sci/gui32/gui32.cpp +++ b/engines/sci/gui32/gui32.cpp @@ -40,6 +40,7 @@ #include "sci/gui32/gui32.h" #include "sci/gui/gui_animate.h" #include "sci/gui/gui_cursor.h" +#include "sci/gui/gui_gfx.h" // This is the real width of a text with a specified width of 0 #define MAX_TEXT_WIDTH_MAGIC_VALUE 192 @@ -380,6 +381,7 @@ SciGui32::SciGui32( EngineState *state, SciGuiScreen *screen, SciGuiPalette *pal _screen = screen; _palette = palette; _cursor = cursor; + _gfx = new SciGuiGfx(_s, _screen, _palette); } SciGui32::~SciGui32() { |