[Scummvm-cvs-logs] SF.net SVN: scummvm: [30102] scummvm/trunk/engines/scumm/imuse_digi/ dimuse_music.cpp

[fingolfin at users.sourceforge.net]

Revision: 30102
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30102&view=rev
Author:   fingolfin
Date:     2007-12-31 05:05:32 -0800 (Mon, 31 Dec 2007)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp	2007-12-31 11:55:00 UTC (rev 30101)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp	2007-12-31 13:05:32 UTC (rev 30102)
@@ -182,9 +182,9 @@
 			if ((!sequence) && (table->attribPos != 0) &&
 					(table->attribPos == _digStateMusicTable[_curMusicState].attribPos)) {
 				startMusic(table->filename, table->soundId, 0, 127);
-				return;
+			} else {
+				startMusic(table->filename, table->soundId, hookId, 127);
 			}
-			startMusic(table->filename, table->soundId, hookId, 127);
 			break;
 	}
 }
@@ -227,7 +227,7 @@
 void IMuseDigital::setComiMusicSequence(int seqId) {
 	int l, num = -1;
 	
-	// FIXME: It turns out that setDigMusicSequence and setComiMusicSequence arae
+	// FIXME: It turns out that setDigMusicSequence and setComiMusicSequence are
 	// very similiar, with only a few small differences. Question: are those differences
 	// really differences, or just caused by a mistake on our side?
 
@@ -326,9 +326,7 @@
 			if ((!sequence) && (table->attribPos != 0) &&
 					(table->attribPos == _comiStateMusicTable[_curMusicState].attribPos)) {
 				startMusic(table->filename, table->soundId, 0, 127);
-				return;
-			}
-			if (table->transitionType == 12) {
+			} else if (table->transitionType == 12) {
 				startMusic(table->filename, table->soundId, table->hookId, 127);
 			} else {
 				startMusic(table->filename, table->soundId, hookId, 127);


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