aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-05-19 09:47:33 +0000
committerTravis Howell2003-05-19 09:47:33 +0000
commitaa1ddc6a5a13012ef93bfcf8a8e870aed165e997 (patch)
tree383299c3664ea7ea7b09f1391540e3b1408b7e93
parent7091080e7da0fd7f62343a2fef19bc2091baa162 (diff)
downloadscummvm-rg350-aa1ddc6a5a13012ef93bfcf8a8e870aed165e997.tar.gz
scummvm-rg350-aa1ddc6a5a13012ef93bfcf8a8e870aed165e997.tar.bz2
scummvm-rg350-aa1ddc6a5a13012ef93bfcf8a8e870aed165e997.zip
Minor correction to last commit
svn-id: r7679
-rw-r--r--simon/items.cpp9
-rw-r--r--simon/vga.cpp2
2 files changed, 5 insertions, 6 deletions
diff --git a/simon/items.cpp b/simon/items.cpp
index 7df7b91541..99293bedd1 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -1447,11 +1447,10 @@ void SimonState::o_unk_127() {
if (_vc72_var1 != 0xFFFF || _vc72_var1 != 999) {
_vc70_var2 = c;
- _vc70_var1 = 0xffff;
- _vc72_var3 = 0xffff;
- _next_music_to_play = 0xffff;
- if (!(_music_paused))
- midi_play(b);
+ _vc70_var1 = 0xFFFF;
+ _vc72_var3 = 0xFFFF;
+ _next_music_to_play = 0xFFFF;
+ midi_play(b);
_vc72_var1 = b;
} else {
_vc72_var3 = b;
diff --git a/simon/vga.cpp b/simon/vga.cpp
index d1c8accce9..085d722fcc 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -1692,7 +1692,7 @@ void SimonState::vc_62_palette_thing() {
if (!_video_var_3) {
if (_game & GF_SIMON2) {
- if (_next_music_to_play != 0xffff)
+ if (_next_music_to_play != 0xFFFF)
playMusic(999, _next_music_to_play);
}
} else