aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMax Horn2007-12-31 13:05:32 +0000
committerMax Horn2007-12-31 13:05:32 +0000
commita826cd36dd39aa4a0195f827b098279f5113efc7 (patch)
tree3d8cbbe416c81e96f2c5b86d09b687a60d9fe585 /engines/scumm
parentfd136613175328085536df0ad98936a3b4f51152 (diff)
downloadscummvm-rg350-a826cd36dd39aa4a0195f827b098279f5113efc7.tar.gz
scummvm-rg350-a826cd36dd39aa4a0195f827b098279f5113efc7.tar.bz2
scummvm-rg350-a826cd36dd39aa4a0195f827b098279f5113efc7.zip
cleanup
svn-id: r30102
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/imuse_digi/dimuse_music.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp
index 41885a8e5c..044ba3e3fb 100644
--- a/engines/scumm/imuse_digi/dimuse_music.cpp
+++ b/engines/scumm/imuse_digi/dimuse_music.cpp
@@ -182,9 +182,9 @@ void IMuseDigital::playDigMusic(const char *songName, const imuseDigTable *table
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::setComiMusicState(int stateId) {
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 @@ void IMuseDigital::playComiMusic(const char *songName, const imuseComiTable *tab
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);