From 6b226d5943b61e700a8ec7a3099c99f654f13b89 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 9 Dec 2011 16:04:45 +0100
Subject: DREAMWEB: Do savefile reading directly in loadPosition() /
 scanForNames()

---
 engines/dreamweb/dreamweb.cpp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'engines/dreamweb/dreamweb.cpp')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 12fea56202..b4fc1b7b77 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -232,6 +232,9 @@ void DreamWebEngine::openFile(const Common::String &name) {
 	closeFile();
 	if (_file.open(name))
 		return;
+	// File not found? See if there is a save state with this name
+	// FIXME: Is this really needed? If yes, document why; if not,
+	// remove all traces of _inSaveFile.
 	_inSaveFile = _saveFileMan->openForLoading(name);
 	if (_inSaveFile)
 		return;
@@ -270,20 +273,6 @@ Common::String DreamWebEngine::getSavegameFilename(int slot) const {
 	return filename;
 }
 
-bool DreamWebEngine::openSaveFileForReading(const Common::String &name) {
-	processEvents();
-	delete _inSaveFile;
-	_inSaveFile = _saveFileMan->openForLoading(name);
-	return _inSaveFile != 0;
-}
-
-uint DreamWebEngine::readFromSaveFile(uint8 *data, uint size) {
-	processEvents();
-	if (!_inSaveFile)
-		error("save file was not opened for reading");
-	return _inSaveFile->read(data, size);
-}
-
 void DreamWebEngine::keyPressed(uint16 ascii) {
 	debug(2, "key pressed = %04x", ascii);
 	uint16 in = (_base.data.word(DreamGen::kBufferin) + 1) & 0x0f;
-- 
cgit v1.2.3