[Scummvm-cvs-logs] SF.net SVN: scummvm:[46628] scummvm/trunk/engines/sci/engine/savegame.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Dec 27 13:12:15 CET 2009


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

Log Message:
-----------
Hopefully fixed compilation

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

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-12-27 12:08:32 UTC (rev 46627)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-12-27 12:12:14 UTC (rev 46628)
@@ -615,8 +615,10 @@
 		}
 	}
 }
-#else
+#endif
+
 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();
@@ -641,8 +643,8 @@
 	}
 
 	_mutex.unlock();
+#endif
 }
-#endif
 
 #pragma mark -
 


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




More information about the Scummvm-git-logs mailing list