aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/message.cpp
diff options
context:
space:
mode:
authorsluicebox2019-10-11 14:18:26 -0700
committersluicebox2019-10-11 14:18:26 -0700
commit511e5441e360bf283cafc48981580bea2e07a44b (patch)
tree91bea8871404a5e1f7d4b65c82a1777083f97680 /engines/sci/engine/message.cpp
parentea01e42918b1582f774727fd0fceb0672762af45 (diff)
downloadscummvm-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/message.cpp')
-rw-r--r--engines/sci/engine/message.cpp4
1 files changed, 1 insertions, 3 deletions
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);