aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2002-11-07 10:42:35 +0000
committerTravis Howell2002-11-07 10:42:35 +0000
commit5f85f65eec8125fb484cef0b05faac9e017ff770 (patch)
tree38a2aab4d7b23d7056598341fab4dc18f4ef67c3
parenta2be90a22125fa2652f65ee2387d5b28fb4e6922 (diff)
downloadscummvm-rg350-5f85f65eec8125fb484cef0b05faac9e017ff770.tar.gz
scummvm-rg350-5f85f65eec8125fb484cef0b05faac9e017ff770.tar.bz2
scummvm-rg350-5f85f65eec8125fb484cef0b05faac9e017ff770.zip
Add another work around and some fixme comments
svn-id: r5456
-rw-r--r--simon/items.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/simon/items.cpp b/simon/items.cpp
index 3a8dcbeba8..d9259ea34e 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -1609,6 +1609,8 @@ void SimonState::o_unk_127()
warning("o_unk_127(%d,%d,%d) not implemented properly", a, b, c);
+ //FIXME simon 2 attempts to use music track 93 in ending sequences
+ // which doesn't exist so prevent that happening
if ((a != _last_music_played) && (a < 93)) {
_last_music_played = a;
playMusic(a);
@@ -1617,6 +1619,11 @@ void SimonState::o_unk_127()
uint a = getVarOrWord();
/*uint b = */ getVarOrWord();
+ //FIXME music track 12 uses a different and unknown format
+ // Using music in next area as temporary work around
+ if (a == 12)
+ a=0;
+
if (a != _last_music_played) {
_last_music_played = a;
playMusic(a);