[Scummvm-cvs-logs] SF.net SVN: scummvm:[46630] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 46630
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46630&view=rev
Author:   thebluegr
Date:     2009-12-27 12:21:12 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
Really fixed compilation

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/sci/sfx/music.h

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-12-27 12:17:43 UTC (rev 46629)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-12-27 12:21:12 UTC (rev 46630)
@@ -615,10 +615,8 @@
 		}
 	}
 }
-#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 @@
 	}
 
 	_mutex.unlock();
-#endif
 }
+#endif
 
 #pragma mark -
 

Modified: scummvm/trunk/engines/sci/sfx/music.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.h	2009-12-27 12:17:43 UTC (rev 46629)
+++ scummvm/trunk/engines/sci/sfx/music.h	2009-12-27 12:21:12 UTC (rev 46630)
@@ -86,7 +86,12 @@
 
 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 @@
 
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.