aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2012-07-03 18:11:41 +0300
committerFilippos Karapetis2012-07-03 18:11:41 +0300
commit5a47afea9ed5d0cca89ca01d48be937dcba02bbd (patch)
treeb20072f95cdc41c89d3d66c3832ff4f35ef7c66a
parent9184a40fcc2263fae7bc67777346f592d50a39eb (diff)
downloadscummvm-rg350-5a47afea9ed5d0cca89ca01d48be937dcba02bbd.tar.gz
scummvm-rg350-5a47afea9ed5d0cca89ca01d48be937dcba02bbd.tar.bz2
scummvm-rg350-5a47afea9ed5d0cca89ca01d48be937dcba02bbd.zip
SCI: Move kGetWindowsOption together with the other misc kernel functions
-rw-r--r--engines/sci/engine/kgraphics32.cpp12
-rw-r--r--engines/sci/engine/kmisc.cpp12
2 files changed, 12 insertions, 12 deletions
diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index 413ad1ecb1..14ea409a58 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 12c830f622..8b7fc4ffec 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