OPENGL: Merged from trunk, from rev 52105 to 53396.

This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399

1 files changed, 15 insertions, 1 deletions

diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index fbe20410de..d8ae1a3418 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -188,7 +188,9 @@ reg_t kGetTime(EngineState *s, int argc, reg_t *argv) {
 
 	int mode = (argc > 0) ? argv[0].toUint16() : 0;
 
-	if (getSciVersion() <= SCI_VERSION_0_LATE && mode > 1)
+	// Modes 2 and 3 are supported since 0.629.
+	// This condition doesn't check that exactly, but close enough.
+	if (getSciVersion() == SCI_VERSION_0_EARLY && mode > 1)
 		error("kGetTime called in SCI0 with mode %d (expected 0 or 1)", mode);
 
 	switch (mode) {
@@ -387,6 +389,18 @@ reg_t kPlatform(EngineState *s, int argc, reg_t *argv) {
 	return NULL_REG;
 }
 
+#ifdef ENABLE_SCI32
+reg_t kWinDLL(EngineState *s, int argc, reg_t *argv) {
+	kStub(s, argc, argv);
+
+	// TODO: This seems to be loading and calling Windows DLLs. We'll probably
+	// need to either ignore calls made here, or wire each call for each game
+	// that requests it by hand
+
+	error("kWinDLL called");
+}
+#endif
+
 reg_t kEmpty(EngineState *s, int argc, reg_t *argv) {
 	// Placeholder for empty kernel functions which are still called from the
 	// engine scripts (like the empty kSetSynonyms function in SCI1.1). This