diff options
author | Eugene Sandulenko | 2004-11-24 00:14:21 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2004-11-24 00:14:21 +0000 |
commit | 31e434dcf1e46510606efa3025c24c17ace379c6 (patch) | |
tree | addc1c7b6b9b2489eb9aca49e21ee0c729671adb /scumm | |
parent | 6414ec92a2a3509946ae4ec35a3a77e76ad152df (diff) | |
download | scummvm-rg350-31e434dcf1e46510606efa3025c24c17ace379c6.tar.gz scummvm-rg350-31e434dcf1e46510606efa3025c24c17ace379c6.tar.bz2 scummvm-rg350-31e434dcf1e46510606efa3025c24c17ace379c6.zip |
Fix a`ll engines. They work, though current fix is just temporary.
There are plans to add some brains to GameDetector class, which will let us
avoid passing detector to init() method.
svn-id: r15873
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/scumm.cpp | 7 | ||||
-rw-r--r-- | scumm/scumm.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index bdb91a1d99..864d261207 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -976,10 +976,13 @@ ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, cons #pragma mark --- Initialization --- #pragma mark - -int ScummEngine::init() { +int ScummEngine::init(GameDetector &detector) { // Initialize backend - _system->initSize(_screenWidth, _screenHeight); + _system->beginGFXTransaction(); + initCommonGFX(detector); + _system->initSize(_screenWidth, _screenHeight); + _system->endGFXTransaction(); int cd_num = ConfMan.getInt("cdrom"); if (cd_num >= 0 && (_features & GF_AUDIOTRACKS)) diff --git a/scumm/scumm.h b/scumm/scumm.h index 43b7728958..25aeaac501 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -388,7 +388,7 @@ public: int go(); // Init functions - int init(); + int init(GameDetector &detector); virtual void setupScummVars(); void initScummVars(); |