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

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Wed May 13 13:43:25 CEST 2009


Revision: 40520
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40520&view=rev
Author:   dreammaster
Date:     2009-05-13 11:43:24 +0000 (Wed, 13 May 2009)

Log Message:
-----------
Moved the construction of _sound and _music to the constructor, in case the run() method exits before initiaze is called

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/cruise.cpp

Modified: scummvm/trunk/engines/cruise/cruise.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise.cpp	2009-05-13 07:28:55 UTC (rev 40519)
+++ scummvm/trunk/engines/cruise/cruise.cpp	2009-05-13 11:43:24 UTC (rev 40520)
@@ -62,6 +62,8 @@
 
 	_vm = this;
 	_debugger = new Debugger();
+	_music = new MusicPlayer();
+	_sound = new SoundPlayer();
 
 	syst->getEventManager()->registerRandomSource(_rnd, "cruise");
 }
@@ -131,9 +133,6 @@
 	_driver = MidiDriver::createMidi(midiDriver);
 	if (_mt32)
 		_driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
-
-	_music = new MusicPlayer();
-	_sound = new SoundPlayer();
 }
 
 bool CruiseEngine::loadLanguageStrings() {


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