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

[m_kiewitz at users.sourceforge.net]

Revision: 46950
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46950&view=rev
Author:   m_kiewitz
Date:     2010-01-03 21:17:58 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
SCI/newmusic: this fix will make qfg1vga character selection music work

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

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-03 21:12:44 UTC (rev 46949)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-03 21:17:58 UTC (rev 46950)
@@ -279,6 +279,7 @@
 		newSound->soundRes = new SoundResource(number, _resMan, _soundVersion);
 	else
 		newSound->soundRes = 0;
+
 	newSound->soundObj = obj;
 	newSound->loop = GET_SEL32V(_segMan, obj, loop);
 	newSound->prio = GET_SEL32V(_segMan, obj, pri) & 0xFF;
@@ -301,8 +302,11 @@
 		newSound->pStreamAud = _audio->getAudioStream(number, 65535, &sampleLen);
 		newSound->soundType = Audio::Mixer::kSpeechSoundType;
 	} else {
-		if (newSound->soundRes)
-			_music->soundInitSnd(newSound);
+		// If sound resource doesnt exist, we are supposed to leave nodePtr/handle selector alone
+		//  otherwise character selection music in qfg1vga wont work.
+		if (!newSound->soundRes)
+			return;
+		_music->soundInitSnd(newSound);
 	}
 
 	_music->pushBackSlot(newSound);


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