[Scummvm-cvs-logs] scummvm master -> 5a47afea9ed5d0cca89ca01d48be937dcba02bbd

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5a47afea9e SCI: Move kGetWindowsOption together with the other misc kernel functions


Commit: 5a47afea9ed5d0cca89ca01d48be937dcba02bbd
    https://github.com/scummvm/scummvm/commit/5a47afea9ed5d0cca89ca01d48be937dcba02bbd
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-07-03T08:11:41-07:00

Commit Message:
SCI: Move kGetWindowsOption together with the other misc kernel functions

Changed paths:
    engines/sci/engine/kgraphics32.cpp
    engines/sci/engine/kmisc.cpp



diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index 413ad1e..14ea409 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -197,18 +197,6 @@ reg_t kDisposeTextBitmap(EngineState *s, int argc, reg_t *argv) {
 	return s->r_acc;
 }
 
-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;
-	}
-}
-
 reg_t kWinHelp(EngineState *s, int argc, reg_t *argv) {
 	switch (argv[0].toUint16()) {
 	case 1:
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 12c830f..8b7fc4f 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -419,6 +419,18 @@ reg_t kGetSierraProfileInt(EngineState *s, int argc, reg_t *argv) {
 	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