Merge branch 'master' of github.com:scummvm/scummvm into mortevielle

Conflicts:
	base/plugins.cpp
	configure

1 files changed, 78 insertions, 7 deletions

diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index a32480c168..8b7fc4ffec 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -128,7 +128,7 @@ reg_t kMemoryInfo(EngineState *s, int argc, reg_t *argv) {
 	// fragmented
 	const uint16 size = 0x7fea;
 
-	switch (argv[0].offset) {
+	switch (argv[0].getOffset()) {
 	case K_MEMORYINFO_LARGEST_HEAP_BLOCK:
 		// In order to prevent "Memory fragmented" dialogs from
 		// popping up in some games, we must return FREE_HEAP - 2 here.
@@ -140,7 +140,7 @@ reg_t kMemoryInfo(EngineState *s, int argc, reg_t *argv) {
 		return make_reg(0, size);
 
 	default:
-		error("Unknown MemoryInfo operation: %04x", argv[0].offset);
+		error("Unknown MemoryInfo operation: %04x", argv[0].getOffset());
 	}
 
 	return NULL_REG;
@@ -304,7 +304,7 @@ reg_t kMemory(EngineState *s, int argc, reg_t *argv) {
 		break;
 	}
 	case K_MEMORY_PEEK : {
-		if (!argv[1].segment) {
+		if (!argv[1].getSegment()) {
 			// This occurs in KQ5CD when interacting with certain objects
 			warning("Attempt to peek invalid memory at %04x:%04x", PRINT_REG(argv[1]));
 			return s->r_acc;
@@ -334,11 +334,11 @@ reg_t kMemory(EngineState *s, int argc, reg_t *argv) {
 		}
 
 		if (ref.isRaw) {
-			if (argv[2].segment) {
+			if (argv[2].getSegment()) {
 				error("Attempt to poke memory reference %04x:%04x to %04x:%04x", PRINT_REG(argv[2]), PRINT_REG(argv[1]));
 				return s->r_acc;
 			}
-			WRITE_SCIENDIAN_UINT16(ref.raw, argv[2].offset);		// Amiga versions are BE
+			WRITE_SCIENDIAN_UINT16(ref.raw, argv[2].getOffset());		// Amiga versions are BE
 		} else {
 			if (ref.skipByte)
 				error("Attempt to poke memory at odd offset %04X:%04X", PRINT_REG(argv[1]));
@@ -356,10 +356,81 @@ reg_t kGetConfig(EngineState *s, int argc, reg_t *argv) {
 	Common::String setting = s->_segMan->getString(argv[0]);
 	reg_t data = readSelector(s->_segMan, argv[1], SELECTOR(data));
 
-	warning("Get config setting %s", setting.c_str());
-	s->_segMan->strcpy(data, "");
+	// This function is used to get the benchmarked results stored in the
+	// resource.cfg configuration file in Phantasmagoria 1. Normally,
+	// the configuration file contains values stored by the installer
+	// regarding audio and video settings, which are then used by the
+	// executable. In Phantasmagoria, two extra executable files are used
+	// to perform system benchmarks:
+	// - CPUID for the CPU benchmarks, sets the cpu and cpuspeed settings
+	// - HDDTEC for the graphics and CD-ROM benchmarks, sets the videospeed setting
+	//
+	// These settings are then used by the game scripts directly to modify
+	// the game speed and graphics output. The result of this call is stored
+	// in global 178. The scripts check these values against the value 425.
+	// Anything below that makes Phantasmagoria awfully sluggish, so we're
+	// setting everything to 500, which makes the game playable.
+
+	setting.toLowercase();
+
+	if (setting == "videospeed") {
+		s->_segMan->strcpy(data, "500");
+	} else if (setting == "cpu") {
+		// We always return the fastest CPU setting that CPUID can detect
+		// (i.e. 586).
+		s->_segMan->strcpy(data, "586");
+	} else if (setting == "cpuspeed") {
+		s->_segMan->strcpy(data, "500");
+	} else if (setting == "language") {
+		Common::String languageId = Common::String::format("%d", g_sci->getSciLanguage());
+		s->_segMan->strcpy(data, languageId.c_str());
+	} else if (setting == "torindebug") {
+		// Used to enable the debug mode in Torin's Passage (French).
+		// If true, the debug mode is enabled.
+		s->_segMan->strcpy(data, "");
+	} else if (setting == "leakdump") {
+		// An unknown setting in LSL7. Likely used for debugging.
+		s->_segMan->strcpy(data, "");
+	} else if (setting == "startroom") {
+		// Debug setting in LSL7, specifies the room to start from.
+		s->_segMan->strcpy(data, "");
+	} else {
+		error("GetConfig: Unknown configuration setting %s", setting.c_str());
+	}
+
 	return argv[1];
 }
+
+// Likely modelled after the Windows 3.1 function GetPrivateProfileInt:
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms724345%28v=vs.85%29.aspx
+reg_t kGetSierraProfileInt(EngineState *s, int argc, reg_t *argv) {
+	Common::String category = s->_segMan->getString(argv[0]);	// always "config"
+	category.toLowercase();
+	Common::String setting = s->_segMan->getString(argv[1]);
+	setting.toLowercase();
+	// The third parameter is the default value returned if the configuration key is missing
+
+	if (category == "config" && setting == "videospeed") {
+		// We return the same fake value for videospeed as with kGetConfig
+		return make_reg(0, 500);
+	}
+
+	warning("kGetSierraProfileInt: Returning default value %d for unknown setting %s.%s", argv[2].toSint16(), category.c_str(), setting.c_str());
+	return argv[2];
+}
+
+reg_t kGetWindowsOption(EngineState *s, int argc, reg_t *argv) {
+	uint16 windowsOption = argv[0].toUint16();
+	switch (windowsOption) {
+	case 0:
+		// Title bar on/off in Phantasmagoria, we return 0 (off)
+		return NULL_REG;
+	default:
+		warning("GetWindowsOption: Unknown option %d", windowsOption);
+		return NULL_REG;
+	}
+}
+
 #endif
 
 // kIconBar is really a subop of kMacPlatform for SCI1.1 Mac