diff options
| author | Jonathan Gray | 2008-04-26 09:52:17 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2008-04-26 09:52:17 +0000 |
| commit | 0bb41c23cab40792a43dceeaf7d7759cd971d622 (patch) | |
| tree | 2e2d51e1c6fbb7319928cf5342d47b552c6c7248 /engines/kyra | |
| parent | 13ef28215d69c2c841af719aff62b508e42bcb60 (diff) | |
| download | scummvm-rg350-0bb41c23cab40792a43dceeaf7d7759cd971d622.tar.gz scummvm-rg350-0bb41c23cab40792a43dceeaf7d7759cd971d622.tar.bz2 scummvm-rg350-0bb41c23cab40792a43dceeaf7d7759cd971d622.zip | |
Call _screen->Init(). Fixes segfaults when
trying to start via a command line.
svn-id: r31729
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 90e62895d0..719132929c 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -168,6 +168,8 @@ KyraEngine_v1::~KyraEngine_v1() { int KyraEngine_v1::init() { _screen = new Screen_v1(this, _system); assert(_screen); + if (!_screen->init()) + error("_screen->init() failed"); KyraEngine::init(); _sprites = new Sprites(this, _system); diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 56512eb030..a144f71056 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -193,6 +193,8 @@ Movie *KyraEngine_v2::createWSAMovie() { int KyraEngine_v2::init() { _screen = new Screen_v2(this, _system); assert(_screen); + if (!_screen->init()) + error("_screen->init() failed"); KyraEngine::init(); initStaticResource(); |