Really fixed compilation

svn-id: r46630

2 files changed, 10 insertions, 5 deletions

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 054f1124dd..cee1825b0b 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -615,10 +615,8 @@ static void sync_songlib(Common::Serializer &s, SongLibrary &obj) {
 		}
 	}
 }
-#endif
-
+#else
 void SciMusic::saveLoadWithSerializer(Common::Serializer &s) {
-#ifndef USE_OLD_MUSIC_FUNCTIONS
 	// Sync song lib data. When loading, the actual song lib will be initialized
 	// afterwards in gamestate_restore()
 	_mutex.lock();
@@ -643,8 +641,8 @@ void SciMusic::saveLoadWithSerializer(Common::Serializer &s) {
 	}
 
 	_mutex.unlock();
-#endif
 }
+#endif
 
 #pragma mark -
 
diff --git a/engines/sci/sfx/music.h b/engines/sci/sfx/music.h
index 574dc15e6f..ff2c27e8d3 100644
--- a/engines/sci/sfx/music.h
+++ b/engines/sci/sfx/music.h
@@ -86,7 +86,12 @@ struct MusicEntry {
 
 typedef Common::Array<MusicEntry *> MusicList;
 
-class SciMusic : public Common::Serializable {
+class SciMusic 
+#ifndef USE_OLD_MUSIC_FUNCTIONS
+	: public Common::Serializable
+#endif
+{
+
 public:
 	SciMusic(SciVersion soundVersion);
 	~SciMusic();
@@ -136,7 +141,9 @@ public:
 
 	void reconstructSounds(int savegame_version);
 
+#ifndef USE_OLD_MUSIC_FUNCTIONS
 	virtual void saveLoadWithSerializer(Common::Serializer &ser);
+#endif
 
 protected:
 	byte findAudEntry(uint16 nAud, byte&oVolume, uint32& oOffset, uint32&oSize);