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

[khalek at users.sourceforge.net]

Revision: 31729
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31729&view=rev
Author:   khalek
Date:     2008-04-26 02:52:17 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
Call _screen->Init().  Fixes segfaults when
trying to start via a command line.

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

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-04-25 22:38:40 UTC (rev 31728)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-04-26 09:52:17 UTC (rev 31729)
@@ -168,6 +168,8 @@
 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-25 22:38:40 UTC (rev 31728)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-04-26 09:52:17 UTC (rev 31729)
@@ -193,6 +193,8 @@
 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.