diff options
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kernel.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/kernel.h | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kmisc.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/message.cpp | 4 |
5 files changed, 5 insertions, 11 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index ab332511d7..3cf5fd5b79 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -116,7 +116,7 @@ void Kernel::loadSelectorNames() { Resource *r = _resMan->findResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SELECTORS), 0); bool oldScriptHeader = (getSciVersion() == SCI_VERSION_0_EARLY); -#ifdef ENABLE_SCI32_MAC +#ifdef ENABLE_SCI32 // Starting with KQ7, Mac versions have a BE name table. GK1 Mac and earlier (and all // other platforms) always use LE. const bool isBE = (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_2_1_EARLY @@ -608,7 +608,7 @@ void Kernel::mapFunctions() { continue; } -#ifdef ENABLE_SCI32_MAC +#ifdef ENABLE_SCI32 // HACK: Phantasmagoria Mac uses a modified kDoSound (which *nothing* // else seems to use)! if (g_sci->getPlatform() == Common::kPlatformMacintosh && g_sci->getGameId() == GID_PHANTASMAGORIA && kernelName == "DoSound") { diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index c1cce33e5d..f88afccfbe 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -644,10 +644,8 @@ reg_t kDeleteLine(EngineState *s, int argc, reg_t *argv); reg_t kWinDLL(EngineState *s, int argc, reg_t *argv); -#ifdef ENABLE_SCI32_MAC // Phantasmagoria Mac Special Kernel Function reg_t kDoSoundPhantasmagoriaMac(EngineState *s, int argc, reg_t *argv); -#endif // SCI3 Kernel functions reg_t kPlayDuck(EngineState *s, int argc, reg_t *argv); 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()); diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index e6cd4ffc7f..1a34e82c5e 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -70,7 +70,7 @@ CREATE_DOSOUND_FORWARD(DoSoundSetVolume) CREATE_DOSOUND_FORWARD(DoSoundSetPriority) CREATE_DOSOUND_FORWARD(DoSoundSetLoop) -#ifdef ENABLE_SCI32_MAC +#ifdef ENABLE_SCI32 reg_t kDoSoundPhantasmagoriaMac(EngineState *s, int argc, reg_t *argv) { // Phantasmagoria Mac (and seemingly no other game (!)) uses this // cutdown version of kDoSound. diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp index 0d7f03ca1e..2d195b1137 100644 --- a/engines/sci/engine/message.cpp +++ b/engines/sci/engine/message.cpp @@ -151,7 +151,7 @@ public: } }; -#ifdef ENABLE_SCI32_MAC +#ifdef ENABLE_SCI32 // SCI32 Mac decided to add an extra byte (currently unknown in meaning) between // the talker and the string... class MessageReaderV4_MacSCI32 : public MessageReader { @@ -211,8 +211,6 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re case 4: #ifdef ENABLE_SCI32 case 5: // v5 seems to be compatible with v4 -#endif -#ifdef ENABLE_SCI32_MAC // SCI32 Mac is different than SCI32 DOS/Win here if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_2_1_EARLY) reader = new MessageReaderV4_MacSCI32(*res); |