diff options
| author | sluicebox | 2019-10-11 14:18:26 -0700 |
|---|---|---|
| committer | sluicebox | 2019-10-11 14:18:26 -0700 |
| commit | 511e5441e360bf283cafc48981580bea2e07a44b (patch) | |
| tree | 91bea8871404a5e1f7d4b65c82a1777083f97680 /engines/sci/engine/kmisc.cpp | |
| parent | ea01e42918b1582f774727fd0fceb0672762af45 (diff) | |
| download | scummvm-rg350-511e5441e360bf283cafc48981580bea2e07a44b.tar.gz scummvm-rg350-511e5441e360bf283cafc48981580bea2e07a44b.tar.bz2 scummvm-rg350-511e5441e360bf283cafc48981580bea2e07a44b.zip | |
SCI32: Enable Mac code (remove ENABLE_SCI32_MAC)
Diffstat (limited to 'engines/sci/engine/kmisc.cpp')
| -rw-r--r-- | engines/sci/engine/kmisc.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index 21124606c7..4c2bb2fe4b 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -546,7 +546,7 @@ reg_t kMacPlatform(EngineState *s, int argc, reg_t *argv) { // In SCI1, its usage is still unknown // In SCI1.1, it's NOP // In SCI32, it's used for remapping cursor ID's -#ifdef ENABLE_SCI32_MAC +#ifdef ENABLE_SCI32 if (getSciVersion() >= SCI_VERSION_2_1_EARLY) // Set Mac cursor remap g_sci->_gfxCursor32->setMacCursorRemapList(argc - 1, argv + 1); else @@ -662,12 +662,10 @@ reg_t kPlatform32(EngineState *s, int argc, reg_t *argv) { case Common::kPlatformWindows: return make_reg(0, kSciPlatformWindows); case Common::kPlatformMacintosh: -#ifdef ENABLE_SCI32_MAC // For Mac versions, kPlatform(0) with other args has more functionality if (argc > 1) return kMacPlatform(s, argc - 1, argv + 1); else -#endif return make_reg(0, kSciPlatformMacintosh); default: error("Unknown platform %d", g_sci->getPlatform()); |