[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.97,1.98 imuse.cpp,2.74,2.75

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv20637

Modified Files:
	saveload.cpp imuse.cpp 
Log Message:
Remove old tweak that can break the music when restoring now ... Chris, you should check it too :p

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- saveload.cpp	5 Aug 2003 16:43:33 -0000	1.97
+++ saveload.cpp	6 Aug 2003 21:07:59 -0000	1.98
@@ -717,19 +717,7 @@
 	_saveLoadStream->fread(b, 1, len);
 }
 
-#ifdef _WIN32_WCE
-
-// Perhaps not necessary anymore with latest checks
-
-bool Serializer::checkEOFLoadStream() {
-	if (!_saveLoadStream->fseek(1, SEEK_CUR))
-		return true;
-	if (_saveLoadStream->feof())
-		return true;
-	_saveLoadStream->fseek(-1, SEEK_CUR);
-	return false;
-}
-#elif defined(__PALM_OS__)
+#if defined(__PALM_OS__)
 bool Serializer::checkEOFLoadStream() {
 
 	if (_saveLoadStream->feof())

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.74
retrieving revision 2.75
diff -u -d -r2.74 -r2.75
--- imuse.cpp	6 Aug 2003 18:20:14 -0000	2.74
+++ imuse.cpp	6 Aug 2003 21:07:59 -0000	2.75
@@ -1321,10 +1321,7 @@
 		MKEND()
 	};
 
-#ifdef _WIN32_WCE // Don't break savegames made with andys' build
-	if (!ser->isSaving() && ser->checkEOFLoadStream())
-		return 0;
-#elif defined(__PALM_OS__) //	previous PalmOS ver. without imuse implementation or not saved(Oopps...forgot it !), is this really working ? will we have sound with old saved game ?
+#if defined(__PALM_OS__) //	previous PalmOS ver. without imuse implementation or not saved(Oopps...forgot it !), is this really working ? will we have sound with old saved game ?
 	if (!ser->isSaving() && ser->checkEOFLoadStream())
 		return 0;	//palmfixme