SCI32: Clean up and fix some SCI32-only kFileIO operations

3 files changed, 44 insertions, 54 deletions

diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index b3677d965b..c1f33f57cc 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -716,7 +716,7 @@ reg_t kFileIOReadByte(EngineState *s, int argc, reg_t *argv);
 reg_t kFileIOWriteByte(EngineState *s, int argc, reg_t *argv);
 reg_t kFileIOReadWord(EngineState *s, int argc, reg_t *argv);
 reg_t kFileIOWriteWord(EngineState *s, int argc, reg_t *argv);
-reg_t kFileIOCreateSaveSlot(EngineState *s, int argc, reg_t *argv);
+reg_t kFileIOGetCWD(EngineState *s, int argc, reg_t *argv);
 reg_t kFileIOIsValidDirectory(EngineState *s, int argc, reg_t *argv);
 #endif
 
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index 8d2408a3be..3275ca0dcf 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -326,13 +326,13 @@ static const SciKernelMapSubEntry kFileIO_subops[] = {
 	{ SIG_SCIALL,         10, MAP_CALL(FileIOExists),              "r",                    NULL },
 	{ SIG_SINCE_SCI11,    11, MAP_CALL(FileIORename),              "rr",                   NULL },
 #ifdef ENABLE_SCI32
-	{ SIG_SCI32,          13, MAP_CALL(FileIOReadByte),            "i",                    NULL },
-	{ SIG_SCI32,          14, MAP_CALL(FileIOWriteByte),           "ii",                   NULL },
-	{ SIG_SCI32,          15, MAP_CALL(FileIOReadWord),            "i",                    NULL },
-	{ SIG_SCI32,          16, MAP_CALL(FileIOWriteWord),           "ii",                   NULL },
-	{ SIG_SCI32,          17, MAP_CALL(FileIOCreateSaveSlot),      "ir",                   NULL },
-	{ SIG_SCI32,          18, MAP_EMPTY(FileIOChangeDirectory),    "r",                    NULL }, // for SQ6, when changing the savegame directory in the save/load dialog
-	{ SIG_SCI32,          19, MAP_CALL(FileIOIsValidDirectory),    "r",                    NULL }, // for Torin / Torin demo
+	{ SIG_SINCE_SCI21MID, 13, MAP_CALL(FileIOReadByte),            "i",                    NULL },
+	{ SIG_SINCE_SCI21MID, 14, MAP_CALL(FileIOWriteByte),           "ii",                   NULL },
+	{ SIG_SINCE_SCI21MID, 15, MAP_CALL(FileIOReadWord),            "i",                    NULL },
+	{ SIG_SINCE_SCI21MID, 16, MAP_CALL(FileIOWriteWord),           "ii",                   NULL },
+	{ SIG_SINCE_SCI21MID, 17, "FileIOCheckFreeSpace", kCheckFreeSpace, "i(r)",             NULL },
+	{ SIG_SINCE_SCI21MID, 18, MAP_CALL(FileIOGetCWD),              "r",                    NULL },
+	{ SIG_SINCE_SCI21MID, 19, MAP_CALL(FileIOIsValidDirectory),    "r",                    NULL },
 #endif
 	SCI_SUBOPENTRY_TERMINATOR
 };
@@ -625,9 +625,9 @@ static SciKernelMapEntry s_kernelMap[] = {
 	{ "CelHigh", kCelHigh32,       SIG_SCI32, SIGFOR_ALL,    "iii",                   NULL,            NULL },
 	{ "CelWide", kCelWide32,       SIG_SCI32, SIGFOR_ALL,    "iii",                   NULL,            kCelWide_workarounds },
 #endif
-	{ MAP_CALL(CheckFreeSpace),    SIG_SCI32, SIGFOR_ALL,    "r.*",                   NULL,            NULL },
+	{ MAP_CALL(CheckFreeSpace),    SIG_UNTIL_SCI21EARLY, SIGFOR_ALL, "r(i)",          NULL,            NULL },
 	{ MAP_CALL(CheckFreeSpace),    SIG_SCI11, SIGFOR_ALL,    "r(i)",                  NULL,            NULL },
-	{ MAP_CALL(CheckFreeSpace),    SIG_EVERYWHERE,           "r",                     NULL,            NULL },
+	{ MAP_CALL(CheckFreeSpace),    SIG_SCI16, SIGFOR_ALL,    "r",                     NULL,            NULL },
 	{ MAP_CALL(CheckSaveGame),     SIG_EVERYWHERE,           ".*",                    NULL,            NULL },
 	{ MAP_CALL(Clone),             SIG_EVERYWHERE,           "o",                     NULL,            NULL },
 	{ MAP_CALL(CoordPri),          SIG_EVERYWHERE,           "i(i)",                  NULL,            NULL },
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index b81038385b..4d151de0e8 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -158,33 +158,37 @@ reg_t kDeviceInfo(EngineState *s, int argc, reg_t *argv) {
 }
 
 reg_t kCheckFreeSpace(EngineState *s, int argc, reg_t *argv) {
-	if (argc > 1) {
-		// SCI1.1/SCI32
-		// TODO: don't know if those are right for SCI32 as well
-		// Please note that sierra sci supported both calls either w/ or w/o opcode in SCI1.1
-		switch (argv[1].toUint16()) {
-		case 0: // return saved game size
-			return make_reg(0, 0); // we return 0
-
-		case 1: // return free harddisc space (shifted right somehow)
-			return make_reg(0, 0x7fff); // we return maximum
-
-		case 2: // same as call w/o opcode
-			break;
-			return make_reg(0, 1);
-
-		default:
-			error("kCheckFreeSpace: called with unknown sub-op %d", argv[1].toUint16());
-		}
+	// A file path to test is also passed to this function as a separate
+	// argument, but we do not actually check anything, so it is unused
+
+	enum {
+		kSaveGameSize      = 0,
+		kFreeDiskSpace     = 1,
+		kEnoughSpaceToSave = 2
+	};
+
+	int16 subop;
+	// In SCI2.1mid, the call is moved into kFileIO and the arguments are
+	// flipped
+	if (getSciVersion() >= SCI_VERSION_2_1_MIDDLE) {
+		subop = argc > 0 ? argv[0].toSint16() : 2;
+	} else {
+		subop = argc > 1 ? argv[1].toSint16() : 2;
 	}
 
-	Common::String path = s->_segMan->getString(argv[0]);
+	switch (subop) {
+	case kSaveGameSize:
+		return make_reg(0, 0);
 
-	debug(3, "kCheckFreeSpace(%s)", path.c_str());
-	// We simply always pretend that there is enough space. The alternative
-	// would be to write a big test file, which is not nice on systems where
-	// doing so is very slow.
-	return make_reg(0, 1);
+	case kFreeDiskSpace: // in KiB; up to 32MiB maximum
+		return make_reg(0, 0x7fff);
+
+	case kEnoughSpaceToSave:
+		return make_reg(0, 1);
+
+	default:
+		error("kCheckFreeSpace: called with unknown sub-op %d", subop);
+	}
 }
 
 reg_t kValidPath(EngineState *s, int argc, reg_t *argv) {
@@ -660,7 +664,7 @@ reg_t kFileIOWriteByte(EngineState *s, int argc, reg_t *argv) {
 	FileHandle *f = getFileFromHandle(s, argv[0].toUint16());
 	if (f)
 		f->_out->writeByte(argv[1].toUint16() & 0xff);
-	return s->r_acc; // FIXME: does this really not return anything?
+	return s->r_acc;
 }
 
 reg_t kFileIOReadWord(EngineState *s, int argc, reg_t *argv) {
@@ -674,27 +678,13 @@ reg_t kFileIOWriteWord(EngineState *s, int argc, reg_t *argv) {
 	FileHandle *f = getFileFromHandle(s, argv[0].toUint16());
 	if (f)
 		f->_out->writeUint16LE(argv[1].toUint16());
-	return s->r_acc; // FIXME: does this really not return anything?
+	return s->r_acc;
 }
 
-reg_t kFileIOCreateSaveSlot(EngineState *s, int argc, reg_t *argv) {
-	// Used in Shivers when the user enters his name on the guest book
-	// in the beginning to start the game.
-
-	// Creates a new save slot, and returns if the operation was successful
-
-	// Argument 0 denotes the save slot as a negative integer, 2 means "0"
-	// Argument 1 is a string, with the file name, obtained from kSave(5).
-	// The interpreter checks if it can be written to (by checking for free
-	// disk space and write permissions)
-
-	// We don't really use or need any of this...
-
-	uint16 saveSlot = argv[0].toUint16();
-	const SciArray &fileName = *s->_segMan->lookupArray(argv[1]);
-	warning("kFileIOCreateSaveSlot(%d, '%s')", saveSlot, fileName.toString().c_str());
-
-	return TRUE_REG;	// slot creation was successful
+reg_t kFileIOGetCWD(EngineState *s, int argc, reg_t *argv) {
+	SciArray &fileName = *s->_segMan->lookupArray(argv[0]);
+	fileName.fromString("C:\\SIERRA\\");
+	return argv[0];
 }
 
 reg_t kFileIOIsValidDirectory(EngineState *s, int argc, reg_t *argv) {