[Scummvm-cvs-logs] SF.net SVN: scummvm: [31428] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31428
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31428&view=rev
Author:   lordhoto
Date:     2008-04-06 07:41:25 -0700 (Sun, 06 Apr 2008)

Log Message:
-----------
Fixed crash on startup when running japanese versions of Kyrandia.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra.cpp
    scummvm/trunk/engines/kyra/kyra_v1.cpp
    scummvm/trunk/engines/kyra/kyra_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp	2008-04-06 14:16:27 UTC (rev 31427)
+++ scummvm/trunk/engines/kyra/kyra.cpp	2008-04-06 14:41:25 UTC (rev 31428)
@@ -138,6 +138,8 @@
 	assert(_staticres);
 	if (!_staticres->init())
 		error("_staticres->init() failed");
+	if (!screen()->init())
+		error("screen()->init() failed");
 	_timer = new TimerManager(this, _system);
 	assert(_timer);
 	setupTimers();

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-04-06 14:16:27 UTC (rev 31427)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-04-06 14:41:25 UTC (rev 31428)
@@ -168,9 +168,6 @@
 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);

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-04-06 14:16:27 UTC (rev 31427)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-04-06 14:41:25 UTC (rev 31428)
@@ -186,8 +186,6 @@
 int KyraEngine_v2::init() {
 	_screen = new Screen_v2(this, _system);
 	assert(_screen);
-	if (!_screen->init())
-		error("_screen->init() failed");
 
 	KyraEngine::init();
 	initStaticResource();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.