aboutsummaryrefslogtreecommitdiff
path: root/simon/simon.cpp
diff options
context:
space:
mode:
authorJamieson Christian2003-05-24 03:10:14 +0000
committerJamieson Christian2003-05-24 03:10:14 +0000
commit1b4b6030fedf0fde1431e2e53d03a97caade4005 (patch)
tree8f6d32873ade45a8ad982740ddc32fa284d4711a /simon/simon.cpp
parentbcdf2286f8d877efbb2f7d5434b5e228e150d808 (diff)
downloadscummvm-rg350-1b4b6030fedf0fde1431e2e53d03a97caade4005.tar.gz
scummvm-rg350-1b4b6030fedf0fde1431e2e53d03a97caade4005.tar.bz2
scummvm-rg350-1b4b6030fedf0fde1431e2e53d03a97caade4005.zip
Added support for GMF loop specifier
svn-id: r7874
Diffstat (limited to 'simon/simon.cpp')
-rw-r--r--simon/simon.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 59323cc93c..70a14d3a47 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -5307,6 +5307,8 @@ void SimonState::loadMusic (uint music) {
// TODO Add music support for simon1demo
} else {
midi.stop();
+ midi.setLoop (true); // Must do this BEFORE loading music. (GMF may have its own override.)
+
if (_game & GF_WIN) {
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
midi.loadMultipleSMF (_game_file);
@@ -5326,7 +5328,6 @@ void SimonState::loadMusic (uint music) {
delete f;
}
- midi.setLoop (true);
midi.startTrack (0);
}
}