diff options
author | Martin Kiewitz | 2010-01-15 15:37:40 +0000 |
---|---|---|
committer | Martin Kiewitz | 2010-01-15 15:37:40 +0000 |
commit | 0d81207e6886662994d07c08c652fb97ed397474 (patch) | |
tree | 454c5288818f624699cb0e3c6a33bd933b23efea | |
parent | c4d02f57846e4e46c6d9edb09a8900f90605b46a (diff) | |
download | scummvm-rg350-0d81207e6886662994d07c08c652fb97ed397474.tar.gz scummvm-rg350-0d81207e6886662994d07c08c652fb97ed397474.tar.bz2 scummvm-rg350-0d81207e6886662994d07c08c652fb97ed397474.zip |
SCI: adjust kNewWindow to support argc==15 (on mac according [md5])
svn-id: r47308
-rw-r--r-- | engines/sci/engine/kgraphics.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 68fb8308d9..da8a64e364 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -932,14 +932,14 @@ reg_t kDisposeWindow(EngineState *s, int argc, reg_t *argv) { reg_t kNewWindow(EngineState *s, int argc, reg_t *argv) { Common::Rect rect1 (argv[1].toSint16(), argv[0].toSint16(), argv[3].toSint16(), argv[2].toSint16()); Common::Rect rect2; - int argextra = argc == 13 ? 4 : 0; // Triggers in PQ3 and SCI1.1 games + int argextra = argc >= 13 ? 4 : 0; // Triggers in PQ3 and SCI1.1 games, argc 13 for DOS argc 15 for mac int style = argv[5 + argextra].toSint16(); int priority = (argc > 6 + argextra) ? argv[6 + argextra].toSint16() : -1; int colorPen = (argc > 7 + argextra) ? argv[7 + argextra].toSint16() : 0; int colorBack = (argc > 8 + argextra) ? argv[8 + argextra].toSint16() : 255; // const char *title = argv[4 + argextra].segment ? kernel_dereference_char_pointer(s, argv[4 + argextra], 0) : NULL; - if (argc==13) { + if (argc>=13) { rect2 = Common::Rect (argv[5].toSint16(), argv[4].toSint16(), argv[7].toSint16(), argv[6].toSint16()); } |