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

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun Jul 23 09:06:30 CEST 2006


Revision: 23574
Author:   eriktorbjorn
Date:     2006-07-23 00:06:26 -0700 (Sun, 23 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23574&view=rev

Log Message:
-----------
Initialise the screen before creating the music driver. The MT-32 driver wants
to draw to the screen.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra.cpp
Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp	2006-07-23 06:50:49 UTC (rev 23573)
+++ scummvm/trunk/engines/kyra/kyra.cpp	2006-07-23 07:06:26 UTC (rev 23574)
@@ -136,6 +136,11 @@
 	Common::addSpecialDebugLevel(kDebugLevelSequence, "Sequence", "Sequence debug level");
 	Common::addSpecialDebugLevel(kDebugLevelMovie, "Movie", "Movie debug level");
 
+	_screen = new Screen(this, _system);
+	assert(_screen);
+	if (!_screen->init())
+		error("_screen->init() failed");
+
 	// for now we prefer Adlib over native MIDI
 	int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB/* | MDT_PREFER_MIDI*/);
 
@@ -173,10 +178,6 @@
 	}
 	_sound->setVolume(255);
 	
-	_screen = new Screen(this, _system);
-	assert(_screen);
-	if (!_screen->init())
-		error("_screen->init() failed");
 	_res = new Resource(this);
 	assert(_res);
 	_sprites = new Sprites(this, _system);


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





More information about the Scummvm-git-logs mailing list