- Made some sound functions a bit more generic for use with Kyra1 and Kyra2

HoF:
- Added sound support (sfx sound wrong currently though)
- Implemented opcodes:
  -> o2_loadMusicTrack
  -> o2_playWanderScoreViaMap
  -> o2_playSoundEffect
  -> o2t_playSoundEffect

svn-id: r29183

1 files changed, 3 insertions, 5 deletions

diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 6e5ba98d3c..a7371ac510 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -275,7 +275,6 @@ public:
 	void readSettings();
 	void writeSettings();
 
-	void snd_playTheme(int file, int track = 0);
 	void snd_playVoiceFile(int id);
 	void snd_voiceWaitForFinish(bool ingame = true);
 	bool snd_voiceIsPlaying();
@@ -602,10 +601,6 @@ protected:
 	bool _configSounds;
 	uint8 _configVoice;
 
-	int _curMusicTheme;
-	int _curSfxFile;
-	int16 _lastMusicCommand;
-
 	ScreenAnimator *_animator;
 	SeqPlayer *_seq;
 	Sprites *_sprites;
@@ -644,6 +639,9 @@ protected:
 		uint32 timerCount;
 	} _kyragemFadingState;
 
+	static const int8 _dosTrackMap[];
+	static const int _dosTrackMapSize;
+
 	// TODO: get rid of all variables having pointers to the static resources if possible
 	// i.e. let them directly use the _staticres functions
 	void initStaticResource();