diff options
| -rw-r--r-- | simon/items.cpp | 12 | ||||
| -rw-r--r-- | simon/simon.cpp | 6 | ||||
| -rw-r--r-- | simon/simon.h | 4 | ||||
| -rw-r--r-- | simon/vga.cpp | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index 7aa6e68c51..975879e56f 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -750,10 +750,10 @@ int SimonState::runScript() { break; case 134:{ - _vc70_var2 = 0xFFFF; + _vc70_var2 = -1; midi.stop(); - _last_music_played = 0xFFFF; - _vc72_var1 = 0xFFFF; + _last_music_played = -1; + _vc72_var1 = -1; } break; @@ -1447,9 +1447,9 @@ void SimonState::o_unk_127() { //FIXME Changed if to allow midi jumping to work for now. if (b != 1) { _vc70_var2 = c; - _vc70_var1 = 0xFFFF; - _vc72_var3 = 0xFFFF; - _next_music_to_play = 0xFFFF; + _vc70_var1 = -1; + _vc72_var3 = -1; + _next_music_to_play = -1; midi_play(b); _vc72_var1 = b; } else { diff --git a/simon/simon.cpp b/simon/simon.cpp index 61dddac788..204fbbd474 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -5303,9 +5303,9 @@ void SimonState::playMusic(uint music) { _last_music_played = music; _vc72_var1 = 999; - _vc70_var1 = 0xFFFF; - _vc72_var3 = 0xFFFF; - _next_music_to_play = 0xFFFF; + _vc70_var1 = -1; + _vc72_var3 = -1; + _next_music_to_play = -1; } else { // Simon 1 music if (_game & GF_AMIGAS) { if (_game != GAME_SIMON1CD32) { diff --git a/simon/simon.h b/simon/simon.h index 80b7288254..5b39103838 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -257,8 +257,8 @@ public: byte _video_var_9; uint _midi_sfx; - uint _last_music_played; - uint _next_music_to_play; + uint16 _last_music_played; + uint16 _next_music_to_play; bool _show_preposition; bool _showmessage_flag; diff --git a/simon/vga.cpp b/simon/vga.cpp index 936b6a8303..35ba64a76f 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 != -1) playMusic(_next_music_to_play); } } else @@ -1835,7 +1835,7 @@ void SimonState::vc_70() { void SimonState::vc_71() { // Simon2 - if (_vc72_var3 == 0xFFFF && _vc70_var1 == 0xFFFF) + if (_vc72_var3 == -1 && _vc70_var1 == -1) vc_skip_next_instruction(); } |