merge with trunk

svn-id: r43134

8 files changed, 43 insertions, 31 deletions

diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index 51176c5df9..39615edb6a 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -91,20 +91,19 @@ void CUP_Player::close() {
 }
 
 void CUP_Player::play() {
-	while (parseNextHeaderTag(_fileStream)) {
-		if (_fileStream.ioFailed()) {
-			return;
-		}
-	}
+	while (parseNextHeaderTag(_fileStream)) { }
+
+	if (_fileStream.eos() || _fileStream.err())
+		return;
+
 	debug(1, "rate %d width %d height %d", _playbackRate, _width, _height);
 
 	int ticks = _system->getMillis();
 	while (_dataSize != 0 && !_vm->shouldQuit()) {
-		while (parseNextBlockTag(_fileStream)) {
-			if (_fileStream.ioFailed()) {
-				return;
-			}
-		}
+		while (parseNextBlockTag(_fileStream)) { }
+		if (_fileStream.eos() || _fileStream.err())
+			return;
+
 		int diff = _system->getMillis() - ticks;
 		if (diff >= 0 && diff <= _playbackRate) {
 			_system->delayMillis(_playbackRate - diff);
@@ -200,6 +199,10 @@ void CUP_Player::waitForSfxChannel(int channel) {
 bool CUP_Player::parseNextHeaderTag(Common::SeekableReadStream &dataStream) {
 	uint32 tag = dataStream.readUint32BE();
 	uint32 size = dataStream.readUint32BE() - 8;
+
+	if (dataStream.eos())
+		return false;
+
 	uint32 next = dataStream.pos() + size;
 	debug(1, "New header tag %s %d dataSize %d", tag2str(tag), size, _dataSize);
 	switch (tag) {
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 4c2da19cc5..9e905b0e79 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -78,7 +78,7 @@ protected:
 	int virtScreenSave(byte *dst, int x1, int y1, int x2, int y2);
 	void virtScreenLoad(int resIdx, int x1, int y1, int x2, int y2);
 
-	int convertFilePath(byte *dst);
+	int convertFilePath(byte *dst, int dstSize);
 	virtual void decodeParseString(int a, int b);
 	void swapObjects(int object1, int object2);
 
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index fe0904d632..84fec085cc 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -1621,7 +1621,7 @@ void ScummEngine_v100he::o100_roomOps() {
 
 		copyScriptString((byte *)buffer, sizeof(buffer));
 
-		r = convertFilePath(buffer);
+		r = convertFilePath(buffer, sizeof(buffer));
 		memcpy(_saveLoadFileName, buffer + r, sizeof(buffer) - r);
 		debug(1, "o100_roomOps: case 137: filename %s", _saveLoadFileName);
 
@@ -2239,7 +2239,7 @@ void ScummEngine_v100he::o100_videoOps() {
 			if (_videoParams.flags == 0)
 				_videoParams.flags = 4;
 
-			const char *filename = (char *)_videoParams.filename + convertFilePath(_videoParams.filename);
+			const char *filename = (char *)_videoParams.filename + convertFilePath(_videoParams.filename, sizeof(_videoParams.filename));
 			if (_videoParams.flags == 2) {
 				VAR(119) = _moviePlay->load(filename, _videoParams.flags, _videoParams.wizResNum);
 			} else {
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index 5ad447b1c7..f186495f81 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -93,7 +93,7 @@ void ScummEngine_v60he::setupOpcodes() {
 	_opcodes[0xed].setProc(0, 0);
 }
 
-int ScummEngine_v60he::convertFilePath(byte *dst) {
+int ScummEngine_v60he::convertFilePath(byte *dst, int dstSize) {
 	debug(1, "convertFilePath: original filePath is %s", dst);
 
 	int len = resStrLen(dst);
@@ -113,16 +113,25 @@ int ScummEngine_v60he::convertFilePath(byte *dst) {
 
 	// Strip path
 	int r = 0;
-	if (dst[0] == '.' && dst[1] == '/') { // Game Data Path
+	if (dst[len - 3] == 's' && dst[len - 2] == 'g') { // Save Game File
+		// Change filename prefix to target name, for save game files.
+		char saveName[20];
+		sprintf(saveName, "%s.sg%c", _targetName.c_str(), dst[len - 1]);
+		memcpy(dst, saveName, 20);
+	} else if (dst[0] == '.' && dst[1] == '/') { // Game Data Path
+		// The default game data path is set to './' by ScummVM
 		r = 2;
 	} else if (dst[0] == '*' && dst[1] == '/') { // Save Game Path (HE72 - HE100)
+		// The default save game path is set to '*/' by ScummVM
 		r = 2;
 	} else if (dst[0] == 'c' && dst[1] == ':') { // Save Game Path (HE60 - HE71)
+		// The default save path is game path (DOS) or 'c:/hegames/' (Windows)
 		for (r = len; r != 0; r--) {
 			if (dst[r - 1] == '/')
 				break;
 		}
 	} else if (dst[0] == 'u' && dst[1] == 's') { // Save Game Path (Moonbase Commander)
+		// The default save path is 'user/'
 		r = 5;
 	}
 
@@ -269,7 +278,7 @@ void ScummEngine_v60he::o60_roomOps() {
 		len = resStrLen(_scriptPointer);
 		_scriptPointer += len + 1;
 
-		r = convertFilePath(buffer);
+		r = convertFilePath(buffer, sizeof(buffer));
 		memcpy(_saveLoadFileName, buffer + r, sizeof(buffer) - r);
 		debug(1, "o60_roomOps: case 221: filename %s", _saveLoadFileName);
 
@@ -684,7 +693,7 @@ void ScummEngine_v60he::o60_openFile() {
 	len = resStrLen(_scriptPointer);
 	_scriptPointer += len + 1;
 
-	filename = (char *)buffer + convertFilePath(buffer);
+	filename = (char *)buffer + convertFilePath(buffer, sizeof(buffer));
 	debug(1, "Final filename to %s", filename);
 
 	mode = pop();
@@ -738,7 +747,7 @@ void ScummEngine_v60he::o60_deleteFile() {
 	len = resStrLen(_scriptPointer);
 	_scriptPointer += len + 1;
 
-	filename = (char *)buffer + convertFilePath(buffer);
+	filename = (char *)buffer + convertFilePath(buffer, sizeof(buffer));
 
 	debug(1, "o60_deleteFile (\"%s\")", filename);
 
@@ -760,8 +769,8 @@ void ScummEngine_v60he::o60_rename() {
 	len = resStrLen(_scriptPointer);
 	_scriptPointer += len + 1;
 
-	oldFilename = (char *)buffer1 + convertFilePath(buffer1);
-	newFilename = (char *)buffer2 + convertFilePath(buffer2);
+	oldFilename = (char *)buffer1 + convertFilePath(buffer1, sizeof(buffer1));
+	newFilename = (char *)buffer2 + convertFilePath(buffer2, sizeof(buffer2));
 
 	debug(1, "o60_rename (\"%s\" to \"%s\")", oldFilename, newFilename);
 
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 64c63baa9d..6224ef5b47 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -713,7 +713,7 @@ void ScummEngine_v72he::o72_roomOps() {
 
 		copyScriptString((byte *)buffer, sizeof(buffer));
 
-		r = convertFilePath(buffer);
+		r = convertFilePath(buffer, sizeof(buffer));
 		memcpy(_saveLoadFileName, buffer + r, sizeof(buffer) - r);
 		debug(1, "o72_roomOps: case 221: filename %s", _saveLoadFileName);
 
@@ -1401,7 +1401,7 @@ void ScummEngine_v72he::o72_openFile() {
 		strcpy((char *)buffer, "moonbase.ini");
 	}
 
-	const char *filename = (char *)buffer + convertFilePath(buffer);
+	const char *filename = (char *)buffer + convertFilePath(buffer, sizeof(buffer));
 	debug(1, "Final filename to %s", filename);
 
 	slot = -1;
@@ -1547,7 +1547,7 @@ void ScummEngine_v72he::o72_deleteFile() {
 	byte buffer[256];
 
 	copyScriptString(buffer, sizeof(buffer));
-	const char *filename = (char *)buffer + convertFilePath(buffer);
+	const char *filename = (char *)buffer + convertFilePath(buffer, sizeof(buffer));
 
 	debug(1, "o72_deleteFile(%s)", filename);
 
@@ -1562,8 +1562,8 @@ void ScummEngine_v72he::o72_rename() {
 	copyScriptString(buffer1, sizeof(buffer1));
 	copyScriptString(buffer2, sizeof(buffer2));
 
-	const char *newFilename = (char *)buffer1 + convertFilePath(buffer1);
-	const char *oldFilename = (char *)buffer2 + convertFilePath(buffer2);
+	const char *newFilename = (char *)buffer1 + convertFilePath(buffer1, sizeof(buffer1));
+	const char *oldFilename = (char *)buffer2 + convertFilePath(buffer2, sizeof(buffer2));
 
 	_saveFileMan->renameSavefile(oldFilename, newFilename);
 
diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp
index b71a0f9e10..d7e36106ea 100644
--- a/engines/scumm/he/script_v80he.cpp
+++ b/engines/scumm/he/script_v80he.cpp
@@ -89,7 +89,7 @@ void ScummEngine_v80he::o80_getFileSize() {
 	byte buffer[256];
 
 	copyScriptString(buffer, sizeof(buffer));
-	const char *filename = (char *)buffer + convertFilePath(buffer);
+	const char *filename = (char *)buffer + convertFilePath(buffer, sizeof(buffer));
 
 	Common::SeekableReadStream *f = 0;
 	if (!_saveFileMan->listSavefiles(filename).empty()) {
@@ -154,7 +154,7 @@ void ScummEngine_v80he::o80_readConfigFile() {
 	copyScriptString(section, sizeof(section));
 	copyScriptString(filename, sizeof(filename));
 
-	r = convertFilePath(filename);
+	r = convertFilePath(filename, sizeof(filename));
 
 	if (_game.id == GID_TREASUREHUNT) {
 		// WORKAROUND: Remove invalid characters
@@ -222,7 +222,7 @@ void ScummEngine_v80he::o80_writeConfigFile() {
 		error("o80_writeConfigFile: default type %d", subOp);
 	}
 
-	r = convertFilePath(filename);
+	r = convertFilePath(filename, sizeof(filename));
 
 	if (_game.id == GID_TREASUREHUNT) {
 		// WORKAROUND: Remove invalid characters
diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index f97771a4f8..2da58b4480 100644
--- a/engines/scumm/he/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -1426,7 +1426,7 @@ void ScummEngine_v90he::o90_videoOps() {
 			if (_videoParams.flags == 0)
 				_videoParams.flags = 4;
 
-			const char *filename = (char *)_videoParams.filename + convertFilePath(_videoParams.filename);
+			const char *filename = (char *)_videoParams.filename + convertFilePath(_videoParams.filename, sizeof(_videoParams.filename));
 			if (_videoParams.flags & 2) {
 				VAR(119) = _moviePlay->load(filename, _videoParams.flags, _videoParams.wizResNum);
 			} else {
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index 4c20ed7835..6b1db38b23 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -2083,7 +2083,7 @@ void Wiz::processWizImage(const WizParameters *params) {
 			Common::File f;
 
 			memcpy(filename, params->filename, 260);
-			_vm->convertFilePath(filename);
+			_vm->convertFilePath(filename, sizeof(filename));
 
 			if (f.open((const char *)filename)) {
 				uint32 id = f.readUint32BE();
@@ -2126,7 +2126,7 @@ void Wiz::processWizImage(const WizParameters *params) {
 				break;
 			case 0:
 				memcpy(filename, params->filename, 260);
-				_vm->convertFilePath(filename);
+				_vm->convertFilePath(filename, sizeof(filename));
 
 				if (!f.open((const char *)filename)) {
 					debug(0, "Unable to open for write '%s'", filename);