diff options
author | Colin Snover | 2017-09-24 22:11:34 -0500 |
---|---|---|
committer | Colin Snover | 2017-09-24 22:56:58 -0500 |
commit | 76806732e032771d51d9015720d32eeed874a3cd (patch) | |
tree | ddb525f968be24ff8357dcb9549975a5e9f95a81 /engines/sci/graphics | |
parent | d935ea80c3cafb185c307f082a73d5fa4685df25 (diff) | |
download | scummvm-rg350-76806732e032771d51d9015720d32eeed874a3cd.tar.gz scummvm-rg350-76806732e032771d51d9015720d32eeed874a3cd.tar.bz2 scummvm-rg350-76806732e032771d51d9015720d32eeed874a3cd.zip |
SCI: Remove Mac SCI32 code from SCI16 code
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r-- | engines/sci/graphics/picture.cpp | 9 | ||||
-rw-r--r-- | engines/sci/graphics/view.cpp | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp index 9e9dede1ae..3ae1fd06fb 100644 --- a/engines/sci/graphics/picture.cpp +++ b/engines/sci/graphics/picture.cpp @@ -179,15 +179,6 @@ void GfxPicture::drawCelData(const SciSpan<const byte> &inbuffer, int headerPos, Common::SpanOwner<SciSpan<byte> > celBitmap; celBitmap->allocate(pixelCount, _resource->name()); - if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_2) { - // See GfxView::unpackCel() for why this black/white swap is done - // This picture swap is only needed in SCI32, not SCI1.1 - if (clearColor == 0) - clearColor = 0xff; - else if (clearColor == 0xff) - clearColor = 0; - } - if (compression) { unpackCelData(inbuffer, *celBitmap, clearColor, rlePos, literalPos, _resMan->getViewType(), width, false); } else diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp index ed849cff96..f593225e9f 100644 --- a/engines/sci/graphics/view.cpp +++ b/engines/sci/graphics/view.cpp @@ -628,7 +628,7 @@ void GfxView::unpackCel(int16 loopNo, int16 celNo, SciSpan<byte> &outPtr) { // code, that they would just put a little snippet of code to swap these colors // in various places around the SCI codebase. We figured that it would be less // hacky to swap pixels instead and run the Mac games with a PC palette. - if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_1_1) { + if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() == SCI_VERSION_1_1) { // clearColor is based on PC palette, but the literal data is not. // We flip clearColor here to make it match the literal data. All // these pixels will be flipped back again below. @@ -642,7 +642,7 @@ void GfxView::unpackCel(int16 loopNo, int16 celNo, SciSpan<byte> &outPtr) { unpackCelData(*_resource, outPtr, clearColor, celInfo->offsetRLE, celInfo->offsetLiteral, _resMan->getViewType(), celInfo->width, isMacSci11ViewData); // Swap 0 and 0xff pixels for Mac SCI1.1+ games (see above) - if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_1_1) { + if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() == SCI_VERSION_1_1) { for (uint32 i = 0; i < outPtr.size(); i++) { if (outPtr[i] == 0) outPtr[i] = 0xff; |