diff options
| author | Martin Kiewitz | 2010-06-15 13:34:40 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-06-15 13:34:40 +0000 |
| commit | ba2de6dfa4f160d04474b76d8d5f7a24634196e1 (patch) | |
| tree | 0eaf3ec26bf1ea142c150e6830c09be046e8c27b /engines/sci/sci.cpp | |
| parent | af5346e7ab97190f45be17192deef9a764cd128d (diff) | |
| download | scummvm-rg350-ba2de6dfa4f160d04474b76d8d5f7a24634196e1.tar.gz scummvm-rg350-ba2de6dfa4f160d04474b76d8d5f7a24634196e1.tar.bz2 scummvm-rg350-ba2de6dfa4f160d04474b76d8d5f7a24634196e1.zip | |
SCI: putting SciGui::init into SciEngine, removing it from SciGui(32)
svn-id: r49854
Diffstat (limited to 'engines/sci/sci.cpp')
| -rw-r--r-- | engines/sci/sci.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 2680da9d39..7dba21b800 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -47,6 +47,7 @@ #include "sci/graphics/gui.h" #include "sci/graphics/maciconbar.h" #include "sci/graphics/menu.h" +#include "sci/graphics/paint16.h" #include "sci/graphics/ports.h" #include "sci/graphics/palette.h" #include "sci/graphics/cursor.h" @@ -254,14 +255,7 @@ Common::Error SciEngine::run() { syncSoundSettings(); -#ifdef ENABLE_SCI32 - if (_gui32) - _gui32->init(); - else -#endif - _gui->init(_features->usesOldGfxFunctions()); - // Set default (EGA, amiga or resource 999) palette - _gfxPalette->setDefault(); + initGraphics(); debug("Emulating SCI version %s\n", getSciVersionDesc(getSciVersion())); @@ -353,6 +347,15 @@ bool SciEngine::initGame() { return true; } +void SciEngine::initGraphics() { + if (_gfxPorts) { + _gfxPorts->init(_features->usesOldGfxFunctions(), _gfxPaint16, _gfxText16); + _gfxPaint16->init(_gfxAnimate, _gfxText16); + } + // Set default (EGA, amiga or resource 999) palette + _gfxPalette->setDefault(); +} + #ifdef USE_OLD_MUSIC_FUNCTIONS void SciEngine::initGameSound(int sound_flags, SciVersion soundVersion) { |