[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.30,1.31
Travis Howell
kirben at users.sourceforge.net
Sat Oct 26 02:41:02 CEST 2002
Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv24655/simon
Modified Files:
simon.cpp
Log Message:
Simon 1 dos talkie music working but no looping
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- simon.cpp 25 Oct 2002 15:32:56 -0000 1.30
+++ simon.cpp 26 Oct 2002 09:40:07 -0000 1.31
@@ -4882,7 +4882,7 @@
void SimonState::playMusic(uint music)
{
/* FIXME: not properly implemented */
- /* Simon 1/2 dos talkie music aren't supported */
+ /* Simon 2 dos talkie music isn't supported */
/* Simon 2 dos music isn't supported */
const char *s2 = gss->wav_filename2;
File music_file;
@@ -4910,6 +4910,18 @@
midi.initialize();
midi.play();
+ } else {
+ if (_game == GAME_SIMON1WIN) {
+
+ midi.shutdown();
+
+ _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
+ File *f = _game_file;
+ midi.read_all_songs_old(f);
+
+ midi.initialize();
+ midi.play();
+ }
}
}
More information about the Scummvm-git-logs
mailing list