[Scummvm-cvs-logs] SF.net SVN: scummvm:[46246] scummvm/trunk/engines/sci/sfx/soundcmd.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 46246
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46246&view=rev
Author:   m_kiewitz
Date:     2009-12-03 22:24:29 +0000 (Thu, 03 Dec 2009)

Log Message:
-----------
SCI: Dont init sound when using old sfx code (fixes assert)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-03 19:18:47 UTC (rev 46245)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-03 22:24:29 UTC (rev 46246)
@@ -131,8 +131,10 @@
 
 	_hasNodePtr = (((SciEngine*)g_engine)->getKernel()->_selectorCache.nodePtr != -1);
 
-	_music = new SciMusic();
-	_music->init();
+	#ifndef USE_OLD_MUSIC_FUNCTIONS
+		_music = new SciMusic();
+		_music->init();
+	#endif
 
 	switch (doSoundVersion) {
 	case SCI_VERSION_0_EARLY:


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