[Scummvm-cvs-logs] scummvm master -> ac70aa2e5c246225ac5bf44fb7f746d4f2ec13f8

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ac70aa2e5c HOPKINS: Bumped up savegame version, and added load handling the brief version 3 format


Commit: ac70aa2e5c246225ac5bf44fb7f746d4f2ec13f8
    https://github.com/scummvm/scummvm/commit/ac70aa2e5c246225ac5bf44fb7f746d4f2ec13f8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-31T18:21:29-07:00

Commit Message:
HOPKINS: Bumped up savegame version, and added load handling the brief version 3 format

Changed paths:
    engines/hopkins/saveload.cpp
    engines/hopkins/saveload.h



diff --git a/engines/hopkins/saveload.cpp b/engines/hopkins/saveload.cpp
index 20ef5da..c514df6 100644
--- a/engines/hopkins/saveload.cpp
+++ b/engines/hopkins/saveload.cpp
@@ -258,6 +258,10 @@ void SaveLoadManager::createThumbnail(Graphics::Surface *s) {
 }
 
 void SaveLoadManager::syncSavegameData(Common::Serializer &s, int version) {
+	// The brief version 3 had the highscores embedded. They're in a separate file now, so skip
+	if (version == 3 && s.isLoading())
+		s.skip(100);
+
 	s.syncBytes(&_vm->_globals->_saveData->_data[0], 2050);
 	syncCharacterLocation(s, _vm->_globals->_saveData->_cloneHopkins);
 	syncCharacterLocation(s, _vm->_globals->_saveData->_realHopkins);
diff --git a/engines/hopkins/saveload.h b/engines/hopkins/saveload.h
index 191cb9e..5b77c11 100644
--- a/engines/hopkins/saveload.h
+++ b/engines/hopkins/saveload.h
@@ -35,7 +35,7 @@ namespace Hopkins {
 
 class HopkinsEngine;
 
-#define HOPKINS_SAVEGAME_VERSION 2
+#define HOPKINS_SAVEGAME_VERSION 4
 
 struct hopkinsSavegameHeader {
 	uint8 _version;