aboutsummaryrefslogtreecommitdiff
path: root/simon/simon.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-05-19 09:41:28 +0000
committerTravis Howell2003-05-19 09:41:28 +0000
commit7091080e7da0fd7f62343a2fef19bc2091baa162 (patch)
tree2e8c9a93f155707e48d0615ca7f915184703cd43 /simon/simon.cpp
parent3d14e5305e7b87c3394dbd9ffee80186adbe70bb (diff)
downloadscummvm-rg350-7091080e7da0fd7f62343a2fef19bc2091baa162.tar.gz
scummvm-rg350-7091080e7da0fd7f62343a2fef19bc2091baa162.tar.bz2
scummvm-rg350-7091080e7da0fd7f62343a2fef19bc2091baa162.zip
Try and make some sense ot of simon 2 midi systems
svn-id: r7678
Diffstat (limited to 'simon/simon.cpp')
-rw-r--r--simon/simon.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index e216d669e4..9cf0aaedea 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -5037,6 +5037,19 @@ bool SimonState::load_game(uint slot) {
return true;
}
+void SimonState::midi_play(uint music) {
+ // FIXME What exactly should this function do?
+ if (music != 0) {
+ //_midi_cur_song_ptr = ((arg_0 & 0xFFFF) << 4) + midi_songs;
+ if (_vc72_var1 == 999)
+ //midi.initialize();
+
+ //_midi_var11 = 0;
+ //_midi_var12 = 1;
+ }
+}
+
+
void SimonState::playMusic(uint music_unk, uint music) {
if (midi._midi_sfx_toggle)
return;
@@ -5049,11 +5062,11 @@ void SimonState::playMusic(uint music_unk, uint music) {
} else {
midi.playXMIDI (_game_file);
}
- _midi_unk1 = music;
+ _last_music_played = music;
_vc72_var1 = music_unk;
_vc70_var1 = 0xFFFF;
_vc72_var3 = 0xFFFF;
- _midi_unk2 = 0xFFFF;
+ _next_music_to_play = 0xFFFF;
} else { // Simon 1 music
if (_game & GF_AMIGAS) {
if (_game != GAME_SIMON1CD32) {