From df9a1baadcae2f0d31b30f03bf96db9610f740ca Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 17 Nov 2008 11:09:57 +0000
Subject: Fix regressions in HE games, when slashes are used in filenames for
 file opcodes.

svn-id: r35105
---
 engines/scumm/he/script_v80he.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'engines/scumm/he/script_v80he.cpp')

diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp
index 46449d1683..a0a6ab1ef2 100644
--- a/engines/scumm/he/script_v80he.cpp
+++ b/engines/scumm/he/script_v80he.cpp
@@ -399,17 +399,19 @@ void ScummEngine_v80he::o80_createSound() {
 }
 
 void ScummEngine_v80he::o80_getFileSize() {
-	byte filename[256];
+	byte buffer[256];
 
-	copyScriptString(filename, sizeof(filename));
-	convertFilePath(filename);
+	copyScriptString(buffer, sizeof(buffer));
+	const char *filename = (char *)buffer + convertFilePath(buffer);
 
-	Common::SeekableReadStream *f = _saveFileMan->openForLoading((const char *)filename);
-	if (!f) {
+	Common::SeekableReadStream *f = 0;
+	if (!_saveFileMan->listSavefiles(filename).empty()) {
+		f = _saveFileMan->openForLoading((const char *)filename);
+	} else {
 		Common::File *file = new Common::File();
 		file->open((const char *)filename);
 		if (!file->isOpen())
-			delete f;
+			delete file;
 		else
 			f = file;
 	}
-- 
cgit v1.2.3