[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.186,1.187
Travis Howell
kirben at users.sourceforge.net
Mon May 19 21:04:07 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv22963/simon
Modified Files:
simon.cpp
Log Message:
Revert music play change for Simon 2, since it caused brief tunes between location changes on main map area.
Clean up midi_play
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- simon.cpp 19 May 2003 09:59:23 -0000 1.186
+++ simon.cpp 20 May 2003 04:03:21 -0000 1.187
@@ -2528,7 +2528,7 @@
processSpecialKeys();
}
- delay(10);
+ delay(1);
if (_game & GF_SIMON2) {
if (_timer_1 >= 1000) {
@@ -5037,16 +5037,17 @@
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;
+void SimonState::midi_play(uint a) {
+ if (a == 999)
+ return;
+
if (_vc72_var1 == 999) {
- //midi.initialize();
+ if (_game & GF_WIN) {
+ midi.playMultipleSMF (_game_file);
+ } else {
+ midi.playXMIDI (_game_file);
+ }
}
- //_midi_var11 = 0;
- //_midi_var12 = 1;
- }
}
@@ -5057,11 +5058,6 @@
if (_game & GF_SIMON2) { // Simon 2 music
midi.stop();
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music - 1], SEEK_SET);
- if (_game & GF_WIN) {
- midi.playMultipleSMF (_game_file);
- } else {
- midi.playXMIDI (_game_file);
- }
_last_music_played = music;
_vc72_var1 = 999;
_vc70_var1 = 0xFFFF;
More information about the Scummvm-git-logs
mailing list