aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bacca2003-08-06 21:07:59 +0000
committerNicolas Bacca2003-08-06 21:07:59 +0000
commit1c1fd05a72e0afd5706e79f9862e7744697f4a17 (patch)
tree165062acb29ca76623193da3beaee153c67546a1
parentd8464534a5e516f13cd7d096666031cb4a12fad4 (diff)
downloadscummvm-rg350-1c1fd05a72e0afd5706e79f9862e7744697f4a17.tar.gz
scummvm-rg350-1c1fd05a72e0afd5706e79f9862e7744697f4a17.tar.bz2
scummvm-rg350-1c1fd05a72e0afd5706e79f9862e7744697f4a17.zip
Remove old tweak that can break the music when restoring now ... Chris, you should check it too :p
svn-id: r9582
-rw-r--r--scumm/imuse.cpp5
-rw-r--r--scumm/saveload.cpp14
2 files changed, 2 insertions, 17 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 7ce26fb628..fe9f4eb0e7 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -1321,10 +1321,7 @@ int IMuseInternal::save_or_load(Serializer *ser, Scumm *scumm) {
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
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 80926b7bbe..f42e6604ba 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -717,19 +717,7 @@ void Serializer::loadBytes(void *b, int len) {
_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())