1 files changed, 32 insertions, 29 deletions

diff --git a/engines/hopkins/saveload.cpp b/engines/hopkins/saveload.cpp
index 45b4885c90..b0dea7e6d1 100644
--- a/engines/hopkins/saveload.cpp
+++ b/engines/hopkins/saveload.cpp
@@ -43,39 +43,38 @@ SaveLoadManager::SaveLoadManager(HopkinsEngine *vm) {
 }
 
 bool SaveLoadManager::save(const Common::String &file, const void *buf, size_t n) {
-	Common::OutSaveFile *f = g_system->getSavefileManager()->openForSaving(file);
+	Common::OutSaveFile *savefile = g_system->getSavefileManager()->openForSaving(file);
 
-	if (f) {
-		size_t bytesWritten = f->write(buf, n);
-		f->finalize();
-		delete f;
+	if (savefile) {
+		size_t bytesWritten = savefile->write(buf, n);
+		savefile->finalize();
+		delete savefile;
 
 		return bytesWritten == n;
 	} else
 		return false;
 }
 
+bool SaveLoadManager::saveExists(const Common::String &file) {
+	Common::InSaveFile *savefile = g_system->getSavefileManager()->openForLoading(file);
+	bool result = savefile != NULL;
+	delete savefile;
+	return result;
+}
+
 // Save File
 bool SaveLoadManager::saveFile(const Common::String &file, const void *buf, size_t n) {
 	return save(file, buf, n);
 }
 
-void SaveLoadManager::initSaves() {
-	Common::String dataFilename = "HISCORE.DAT";
-	byte data[100];
-	Common::fill(&data[0], &data[100], 0);
-
-	saveFile(dataFilename, data, 100);
-}
-
 void SaveLoadManager::load(const Common::String &file, byte *buf) {
-	Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(file);
-	if (f == NULL)
-		error("Error openinig file - %s", file.c_str());
+	Common::InSaveFile *savefile = g_system->getSavefileManager()->openForLoading(file);
+	if (savefile == NULL)
+		error("Error opening file - %s", file.c_str());
 
-	int32 filesize = f->size();
-	f->read(buf, filesize);
-	delete f;
+	int32 filesize = savefile->size();
+	savefile->read(buf, filesize);
+	delete savefile;
 }
 
 bool SaveLoadManager::readSavegameHeader(Common::InSaveFile *in, hopkinsSavegameHeader &header) {
@@ -215,13 +214,13 @@ Common::Error SaveLoadManager::loadGame(int slot) {
 
 bool SaveLoadManager::readSavegameHeader(int slot, hopkinsSavegameHeader &header) {
 	// Try and open the save file for reading
-	Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(
-		g_vm->generateSaveName(slot));
-	if (!saveFile)
+	Common::InSaveFile *savefile = g_system->getSavefileManager()->openForLoading(
+		_vm->generateSaveName(slot));
+	if (!savefile)
 		return false;
 
-	bool result = readSavegameHeader(saveFile, header);
-	delete saveFile;
+	bool result = readSavegameHeader(savefile, header);
+	delete savefile;
 	return result;
 }
 
@@ -234,14 +233,14 @@ void SaveLoadManager::createThumbnail(Graphics::Surface *s) {
 	Graphics::Surface thumb8;
 	thumb8.create(w, h, Graphics::PixelFormat::createFormatCLUT8());
 
-	_vm->_graphicsMan->reduceScreenPart(_vm->_graphicsMan->_frontBuffer, (byte *)thumb8.pixels,
+	_vm->_graphicsMan->reduceScreenPart(_vm->_graphicsMan->_frontBuffer, (byte *)thumb8.getPixels(),
 		_vm->_events->_startPos.x, 20, SCREEN_WIDTH, SCREEN_HEIGHT - 40, 80);
 
 	// Convert the 8-bit pixel to 16 bit surface
 	s->create(w, h, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
 
-	const byte *srcP = (const byte *)thumb8.pixels;
-	uint16 *destP = (uint16 *)s->pixels;
+	const byte *srcP = (const byte *)thumb8.getPixels();
+	uint16 *destP = (uint16 *)s->getPixels();
 
 	for (int yp = 0; yp < h; ++yp) {
 		// Copy over the line, using the source pixels as lookups into the pixels palette
@@ -259,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);
@@ -296,8 +299,8 @@ void SaveLoadManager::convertThumb16To8(Graphics::Surface *thumb16, Graphics::Su
 		pixelFormat16.colorToRGB(p, paletteR[palIndex], paletteG[palIndex], paletteB[palIndex]);
 	}
 
-	const uint16 *srcP = (const uint16 *)thumb16->pixels;
-	byte *destP = (byte *)thumb8->pixels;
+	const uint16 *srcP = (const uint16 *)thumb16->getPixels();
+	byte *destP = (byte *)thumb8->getPixels();
 
 	for (int yp = 0; yp < thumb16->h; ++yp) {
 		const uint16 *lineSrcP = srcP;