MOHAWK: Sound cleanup

Merge the Riven sound file code with the main Riven resource code and remove the mainSoundFile parameter from Sound::playSound(). Reasoning: The sound id's do not collide with the sound id's in the main data files. The sound archives only exist because the original CD version had the ability to choose between low and high quality audio.

svn-id: r52631

1 files changed, 1 insertions, 4 deletions

diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h
index 0e3ecd3c51..05c713304d 100644
--- a/engines/mohawk/sound.h
+++ b/engines/mohawk/sound.h
@@ -118,8 +118,7 @@ public:
 	Sound(MohawkEngine*);
 	~Sound();
 
-	void loadRivenSounds(uint16 stack);
-	Audio::SoundHandle *playSound(uint16 id, bool mainSoundFile = true, byte volume = Audio::Mixer::kMaxChannelVolume, bool loop = false);
+	Audio::SoundHandle *playSound(uint16 id, byte volume = Audio::Mixer::kMaxChannelVolume, bool loop = false);
 	void playMidi(uint16 id);
 	void stopSound();
 	void pauseSound();
@@ -132,11 +131,9 @@ public:
 
 private:
 	MohawkEngine *_vm;
-	MohawkArchive *_rivenSoundFile;
 	MidiDriver *_midiDriver;
 	MidiParser *_midiParser;
 
-	static Audio::AudioStream *getCSAmtrakMusic(uint16 id);
 	static Audio::AudioStream *makeMohawkWaveStream(Common::SeekableReadStream *stream);
 	static Audio::AudioStream *makeOldMohawkWaveStream(Common::SeekableReadStream *stream);
 	void initMidi();