aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/kyra.cpp2
-rw-r--r--engines/kyra/kyra_v1.cpp3
-rw-r--r--engines/kyra/kyra_v2.cpp2
3 files changed, 2 insertions, 5 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index 74159dbc00..57d81d37ef 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -138,6 +138,8 @@ int KyraEngine::init() {
assert(_staticres);
if (!_staticres->init())
error("_staticres->init() failed");
+ if (!screen()->init())
+ error("screen()->init() failed");
_timer = new TimerManager(this, _system);
assert(_timer);
setupTimers();
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 74c68d0d42..0d1130abb0 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -168,9 +168,6 @@ 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 176cc1bb6f..825a708ad7 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -186,8 +186,6 @@ 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();