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/graphics | |
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/graphics')
-rw-r--r-- | engines/sci/graphics/cursor32.cpp | 7 | ||||
-rw-r--r-- | engines/sci/graphics/cursor32.h | 2 | ||||
-rw-r--r-- | engines/sci/graphics/palette32.cpp | 4 |
3 files changed, 1 insertions, 12 deletions
diff --git a/engines/sci/graphics/cursor32.cpp b/engines/sci/graphics/cursor32.cpp index a189f7405d..46fce8e673 100644 --- a/engines/sci/graphics/cursor32.cpp +++ b/engines/sci/graphics/cursor32.cpp @@ -196,7 +196,6 @@ void GfxCursor32::setView(const GuiResourceId viewId, const int16 loopNo, const _cursorInfo.loopNo = loopNo; _cursorInfo.celNo = celNo; -#ifdef ENABLE_SCI32_MAC if (!_macCursorRemap.empty() && viewId != -1) { // Mac cursor handling GuiResourceId viewNum = viewId; @@ -241,9 +240,7 @@ void GfxCursor32::setView(const GuiResourceId viewId, const int16 loopNo, const // The cursor will be drawn on next refresh delete macCursor; - } else -#endif - if (viewId != -1) { + } else if (viewId != -1) { CelObjView view(viewId, loopNo, celNo); _hotSpot = view._origin; @@ -449,11 +446,9 @@ void GfxCursor32::move() { } } -#ifdef ENABLE_SCI32_MAC void GfxCursor32::setMacCursorRemapList(int cursorCount, reg_t *cursors) { for (int i = 0; i < cursorCount; i++) _macCursorRemap.push_back(cursors[i].toUint16()); } -#endif } // End of namespace Sci diff --git a/engines/sci/graphics/cursor32.h b/engines/sci/graphics/cursor32.h index fb07c49dbb..1dcd67970b 100644 --- a/engines/sci/graphics/cursor32.h +++ b/engines/sci/graphics/cursor32.h @@ -219,14 +219,12 @@ private: */ void move(); -#ifdef ENABLE_SCI32_MAC public: void setMacCursorRemapList(int cursorCount, reg_t *cursors); private: // Mac versions of games use a remap list to remap their cursors Common::Array<uint16> _macCursorRemap; -#endif }; } // End of namespace Sci diff --git a/engines/sci/graphics/palette32.cpp b/engines/sci/graphics/palette32.cpp index 803dc74044..e139a05188 100644 --- a/engines/sci/graphics/palette32.cpp +++ b/engines/sci/graphics/palette32.cpp @@ -531,15 +531,11 @@ void GfxPalette32::updateHardware() { memset(bpal + (maxIndex + 1) * 3, 0, (255 - maxIndex - 1) * 3); #endif -#ifdef ENABLE_SCI32_MAC if (g_sci->getPlatform() == Common::kPlatformMacintosh) { bpal[255 * 3 ] = 0; bpal[255 * 3 + 1] = 0; bpal[255 * 3 + 2] = 0; } else { -#else - { -#endif // The last color must always be white bpal[255 * 3 ] = 255; bpal[255 * 3 + 1] = 255; |