[Scummvm-cvs-logs] SF.net SVN: scummvm:[53144] scummvm/trunk/engines/toon

[sylvaintv at users.sourceforge.net]

Revision: 53144
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53144&view=rev
Author:   sylvaintv
Date:     2010-10-10 23:10:14 +0000 (Sun, 10 Oct 2010)

Log Message:
-----------
TOON: Fixed offsets in hard coded conversation musics

Modified Paths:
--------------
    scummvm/trunk/engines/toon/audio.cpp
    scummvm/trunk/engines/toon/toon.cpp

Modified: scummvm/trunk/engines/toon/audio.cpp
===================================================================
--- scummvm/trunk/engines/toon/audio.cpp	2010-10-10 22:36:03 UTC (rev 53143)
+++ scummvm/trunk/engines/toon/audio.cpp	2010-10-10 23:10:14 UTC (rev 53144)
@@ -70,6 +70,10 @@
 
 	_currentMusicName = music;
 
+	Common::SeekableReadStream *srs = _vm->resources()->openFile(path);
+	if (!srs)
+		return;
+
 	// see what channel to take
 	if (_channels[0] && _channels[0]->isPlaying() && _channels[1] && _channels[1]->isPlaying()) {
 		// take the one that is fading
@@ -91,7 +95,7 @@
 		_currentMusicChannel = 0;
 	}
 
-	Common::SeekableReadStream *srs = _vm->resources()->openFile(path);
+	
 	//if (!_channels[_currentMusicChannel])
 	//	delete _channels[_currentMusicChannel];
 	_channels[_currentMusicChannel] = new AudioStreamInstance(this, _mixer, srs, true);

Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp	2010-10-10 22:36:03 UTC (rev 53143)
+++ scummvm/trunk/engines/toon/toon.cpp	2010-10-10 23:10:14 UTC (rev 53144)
@@ -2982,8 +2982,8 @@
 
 const char *ToonEngine::getSpecialConversationMusic(int32 conversationId) {
 	static const char * const specialMusic[] = {
+		0, 0,
 		"BR091013", "BR091013",
-		0, 0,
 		"NET1214", "NET1214",
 		0, 0,
 		"CAR1365B", "CAR1365B",
@@ -2991,6 +2991,7 @@
 		0, 0,
 		"CAR14431", "CAR14431",
 		0, 0,
+		0, 0,
 		"SCD16520", "SCD16520",
 		"SCD16520", "SCD16520",
 		"SCD16522", "SCD16522",
@@ -3048,7 +3049,7 @@
 		0, 0
 	};
 
-	return specialMusic[randRange(0, 1) + conversationId * 2];
+	return specialMusic[randRange(0, 1) + conversationId * 2]; 
 }
 
 void ToonEngine::viewInventoryItem(Common::String str, int32 lineId, int32 itemDest) {


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