aboutsummaryrefslogtreecommitdiff
path: root/simon/items.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-05-20 07:26:19 +0000
committerTravis Howell2003-05-20 07:26:19 +0000
commit6b07f4f3973d7b31b200fdd7c9983564432b1e70 (patch)
tree7b22f249149f7271b9d7e4655ce4d8a8ddda27b6 /simon/items.cpp
parent16c2fe1436f83eca6fa88fcbf2b17668bcc964af (diff)
downloadscummvm-rg350-6b07f4f3973d7b31b200fdd7c9983564432b1e70.tar.gz
scummvm-rg350-6b07f4f3973d7b31b200fdd7c9983564432b1e70.tar.bz2
scummvm-rg350-6b07f4f3973d7b31b200fdd7c9983564432b1e70.zip
I broke simon, so revert my last change and added fixmes instead.
svn-id: r7709
Diffstat (limited to 'simon/items.cpp')
-rw-r--r--simon/items.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/simon/items.cpp b/simon/items.cpp
index 2e7dede61d..2457f55b57 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -1445,7 +1445,8 @@ void SimonState::o_unk_127() {
if (b == _vc72_var1 || b == 999)
return;
- if (_vc72_var1 != 0xFFFF || _vc72_var1 != 999) {
+ //FIXME Changed if to allow midi jumping to work for now.
+ if (b != 1) {
_vc70_var2 = c;
_vc70_var1 = 0xFFFF;
_vc72_var3 = 0xFFFF;
@@ -1453,8 +1454,10 @@ void SimonState::o_unk_127() {
midi_play(b);
_vc72_var1 = b;
} else {
+ //FIXME This is another midi jump, not sure if variable order is correct.
_vc72_var3 = b;
_vc72_var2 = c;
+ midi.jump (b, c);
}
} else if (b == 999) {
_next_music_to_play = a;