Add olki's patch for sound effects in simon1dos

Plus hack to allow choice between midi music and sound effects via 's' key

svn-id: r6326

1 files changed, 4 insertions, 2 deletions

diff --git a/simon/midi.h b/simon/midi.h
index 9b3cfc7a6a..d3ab7bd1fd 100644
--- a/simon/midi.h
+++ b/simon/midi.h
@@ -31,7 +31,9 @@ class MidiPlayer {
 public:
 	MidiPlayer();
 
+	bool _midi_sfx_toggle;
 	void read_all_songs (File *in, uint music);
+	void read_all_songs_old (File *in, uint music, uint16 size);
 	void read_all_songs_old (File *in, uint music);
 	void initialize();
 	void shutdown();
@@ -76,9 +78,9 @@ private:
 	byte _masterVolume;    // 0-255
 	bool _paused;
 
-	void read_mthd(File *in, Song *s, bool old, uint music);
+	void read_mthd(File *in, Song *s, bool old, uint music, uint16 size);
 
-	void read_one_song(File *in, Song *s, uint music);
+	void read_one_song(File *in, Song *s, uint music, uint16 size = 0);
 
 	static uint32 track_read_gamma(Track *t);
 	static byte track_read_byte(Track *t);