From bf5840f58764bc0ebf51a7d31471000c39f7be0f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 6 Apr 2008 14:41:25 +0000
Subject: Fixed crash on startup when running japanese versions of Kyrandia.

svn-id: r31428
---
 engines/kyra/kyra.cpp    | 2 ++
 engines/kyra/kyra_v1.cpp | 3 ---
 engines/kyra/kyra_v2.cpp | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'engines/kyra')

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();
-- 
cgit v1.2.3