diff options
| author | Matthew Hoops | 2011-02-03 02:26:57 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2011-02-03 02:26:57 +0000 |
| commit | 4c0af01d6a2a860c09dbd047563ac4f727425492 (patch) | |
| tree | cb08a7b97e41471479ed87cc9f881b49fb16b2cb /engines/sci/engine | |
| parent | 9e761d6f291e956a6fb1dcedcd1d7424b17d88e4 (diff) | |
| download | scummvm-rg350-4c0af01d6a2a860c09dbd047563ac4f727425492.tar.gz scummvm-rg350-4c0af01d6a2a860c09dbd047563ac4f727425492.tar.bz2 scummvm-rg350-4c0af01d6a2a860c09dbd047563ac4f727425492.zip | |
SCI: Disable the special QFG1 Mac icon bar
The original interpreter completely ignores it in favor of the regular one.
svn-id: r55748
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kmisc.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index 0afb6a0a45..b6e1aad679 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -340,6 +340,12 @@ reg_t kMemory(EngineState *s, int argc, reg_t *argv) { // kIconBar is really a subop of kPlatform for SCI1.1 Mac reg_t kIconBar(EngineState *s, int argc, reg_t *argv) { + // QFG1 Mac calls this function to load the Mac icon bar (of which + // the resources do exist), but the game completely ignores it and + // uses the standard icon bar for the game. We do the same. + if (!g_sci->hasMacIconBar()) + return NULL_REG; + // TODO... if (argv[0].toUint16() == 4 && argv[1].toUint16() == 0) { |