From 01af975df48e82938031ed78f95ee2c9719fa3a6 Mon Sep 17 00:00:00 2001
From: Jamieson Christian
Date: Sat, 4 Mar 2006 18:38:27 +0000
Subject: Rearranged methods in the IMuse class declaration to denote those
 derived from the MusicEngine base class.

svn-id: r21079
---
 engines/scumm/imuse/imuse.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'engines/scumm/imuse')

diff --git a/engines/scumm/imuse/imuse.h b/engines/scumm/imuse/imuse.h
index 0c9a9206ba..790deb5dc5 100644
--- a/engines/scumm/imuse/imuse.h
+++ b/engines/scumm/imuse/imuse.h
@@ -62,19 +62,21 @@ public:
 	void on_timer(MidiDriver *midi);
 	void pause(bool paused);
 	int save_or_load(Serializer *ser, ScummEngine *scumm);
-	void setMusicVolume(int vol);
-	void startSound(int sound);
-	void stopSound(int sound);
-	void stopAllSounds();
-	int getSoundStatus(int sound) const;
 	bool get_sound_active(int sound) const;
-	int getMusicTimer() const;
 	int32 doCommand(int a, int b, int c, int d, int e, int f, int g, int h);
 	int32 doCommand(int numargs, int args[]);
 	int clear_queue();
 	void setBase(byte **base);
 	uint32 property(int prop, uint32 value);
-	void terminate();
+
+	// MusicEngine base class methods
+	virtual void setMusicVolume(int vol);
+	virtual void startSound(int sound);
+	virtual void stopSound(int sound);
+	virtual void stopAllSounds();
+	virtual int getSoundStatus(int sound) const;
+	virtual int getMusicTimer() const;
+	virtual void terminate();
 
 	// Factory methods
 	static IMuse *create(OSystem *syst, MidiDriver *nativeMidiDriver, MidiDriver *adlibMidiDriver);
-- 
cgit v1.2.3