Merge remote branch 'upstream/master' into pegasus

1 files changed, 38 insertions, 8 deletions

diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 312497720a..af438bdaff 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -331,7 +331,7 @@ reg_t kDeviceInfo(EngineState *s, int argc, reg_t *argv) {
 		s->_segMan->strcpy(argv[1], "__throwaway");
 		debug(3, "K_DEVICE_INFO_GET_SAVEFILE_NAME(%s,%d) -> %s", game_prefix.c_str(), virtualId, "__throwaway");
 		if ((virtualId < SAVEGAMEID_OFFICIALRANGE_START) || (virtualId > SAVEGAMEID_OFFICIALRANGE_END))
-			error("kDeviceInfo(deleteSave): invalid savegame-id specified");
+			error("kDeviceInfo(deleteSave): invalid savegame ID specified");
 		uint savegameId = virtualId - SAVEGAMEID_OFFICIALRANGE_START;
 		Common::Array<SavegameDesc> saves;
 		listSavegames(saves);
@@ -526,7 +526,7 @@ reg_t kGetSaveFiles(EngineState *s, int argc, reg_t *argv) {
 	char *saveNamePtr = saveNames;
 
 	for (uint i = 0; i < totalSaves; i++) {
-		*slot++ = make_reg(0, saves[i].id + SAVEGAMEID_OFFICIALRANGE_START); // Store the virtual savegame-id ffs. see above
+		*slot++ = make_reg(0, saves[i].id + SAVEGAMEID_OFFICIALRANGE_START); // Store the virtual savegame ID ffs. see above
 		strcpy(saveNamePtr, saves[i].name);
 		saveNamePtr += SCI_MAX_SAVENAME_LENGTH;
 	}
@@ -863,6 +863,10 @@ reg_t kFileIOUnlink(EngineState *s, int argc, reg_t *argv) {
 		int savedir_nr = saves[slotNum].id;
 		name = g_sci->getSavegameName(savedir_nr);
 		result = saveFileMan->removeSavefile(name);
+	} else if (getSciVersion() >= SCI_VERSION_2) {
+		// We don't need to wrap the filename in SCI32 games, as it's already
+		// constructed here
+		result = saveFileMan->removeSavefile(name);
 	} else {
 		const Common::String wrappedName = g_sci->wrapFilename(name);
 		result = saveFileMan->removeSavefile(wrappedName);
@@ -1168,6 +1172,35 @@ reg_t kCD(EngineState *s, int argc, reg_t *argv) {
 	return NULL_REG;
 }
 
+reg_t kMakeSaveCatName(EngineState *s, int argc, reg_t *argv) {
+	// Normally, this creates the name of the save catalogue/directory to save into.
+	// First parameter is the string to save the result into. Second is a string
+	// with game parameters. We don't have a use for this at all, as we have our own
+	// savegame directory management, thus we always return an empty string.
+	return argv[0];
+}
+
+reg_t kMakeSaveFileName(EngineState *s, int argc, reg_t *argv) {
+	// Creates a savegame name from a slot number. Used when deleting saved games.
+	// Param 0: the output buffer (same as in kMakeSaveCatName)
+	// Param 1: a string with game parameters, ignored
+	// Param 2: the selected slot
+
+	SciString *resultString = s->_segMan->lookupString(argv[0]);
+	uint16 virtualId = argv[2].toUint16();
+	if ((virtualId < SAVEGAMEID_OFFICIALRANGE_START) || (virtualId > SAVEGAMEID_OFFICIALRANGE_END))
+		error("kMakeSaveFileName: invalid savegame ID specified");
+	uint saveSlot = virtualId - SAVEGAMEID_OFFICIALRANGE_START;
+	
+	Common::Array<SavegameDesc> saves;
+	listSavegames(saves);
+
+	Common::String filename = g_sci->getSavegameName(saveSlot);
+	resultString->fromString(filename);
+
+	return argv[0];
+}
+
 reg_t kSave(EngineState *s, int argc, reg_t *argv) {
 	switch (argv[0].toUint16()) {
 	case 0:
@@ -1181,12 +1214,9 @@ reg_t kSave(EngineState *s, int argc, reg_t *argv) {
 	case 5:
 		return kGetSaveFiles(s, argc - 1, argv + 1);
 	case 6:
-		// This is used in Shivers to delete saved games, however it
-		// always passes the same file name (SHIVER), so it doesn't
-		// actually delete anything...
-		// TODO: Check why this happens
-		// argv[1] is a string (most likely the save game directory)
-		return kFileIOUnlink(s, argc - 2, argv + 2);
+		return kMakeSaveCatName(s, argc - 1, argv + 1);
+	case 7:
+		return kMakeSaveFileName(s, argc - 1, argv + 1);
 	case 8:
 		// TODO
 		// This is a timer callback, with 1 parameter: the timer object