diff options
| author | md5 | 2011-03-04 21:49:19 +0200 |
|---|---|---|
| committer | md5 | 2011-03-04 22:04:12 +0200 |
| commit | 5b9677da72efadf566be2a666bd9ca44ca35adc8 (patch) | |
| tree | e009b2380a5ce9001cfbbb364f345f00bf6fd9ba /engines/sci/graphics | |
| parent | bc992d77de75076aae5badde98755b1db6b9d9a5 (diff) | |
| download | scummvm-rg350-5b9677da72efadf566be2a666bd9ca44ca35adc8.tar.gz scummvm-rg350-5b9677da72efadf566be2a666bd9ca44ca35adc8.tar.bz2 scummvm-rg350-5b9677da72efadf566be2a666bd9ca44ca35adc8.zip | |
SCI: Cleaned up some view type checks
Diffstat (limited to 'engines/sci/graphics')
| -rw-r--r-- | engines/sci/graphics/picture.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/screen.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/view.cpp | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp index 91fa2e71e8..60b40eee5b 100644 --- a/engines/sci/graphics/picture.cpp +++ b/engines/sci/graphics/picture.cpp @@ -733,7 +733,7 @@ void GfxPicture::drawVectorData(byte *data, int dataSize) { } break; case PIC_OPX_VGA_SET_PALETTE: - if (_resMan->isAmiga32color()) { + if (_resMan->getViewType() == kViewAmiga) { if ((data[curPos] == 0x00) && (data[curPos + 1] == 0x01) && ((data[curPos + 32] & 0xF0) != 0xF0)) { // Left-Over VGA palette, we simply ignore it curPos += 256 + 4 + 1024; diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp index ace69c6972..757fdc53c7 100644 --- a/engines/sci/graphics/screen.cpp +++ b/engines/sci/graphics/screen.cpp @@ -113,7 +113,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) { _unditherState = true; _fontIsUpscaled = false; - if (_resMan->isVGA() || (_resMan->isAmiga32color())) { + if (_resMan->getViewType() != kViewEga) { // It is not 100% accurate to set white to be 255 for Amiga 32-color // games. But 255 is defined as white in our SCI at all times, so it // doesn't matter. diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp index f9bbee4ec6..9e6854e3b9 100644 --- a/engines/sci/graphics/view.cpp +++ b/engines/sci/graphics/view.cpp @@ -104,9 +104,9 @@ void GfxView::initData(GuiResourceId resourceId) { } switch (curViewType) { - case kViewEga: // View-format SCI0 (and Amiga 16 colors) + case kViewEga: // SCI0 (and Amiga 16 colors) isEGA = true; - case kViewAmiga: // View-format Amiga (32 colors) + case kViewAmiga: // Amiga (32 colors) case kViewVga: // View-format SCI1 // LoopCount:WORD MirrorMask:WORD Version:WORD PaletteOffset:WORD LoopOffset0:WORD LoopOffset1:WORD... @@ -412,7 +412,7 @@ void GfxView::unpackCel(int16 loopNo, int16 celNo, byte *outPtr, uint32 pixelCou rlePtr = _resourceData + celInfo->offsetRLE; if (!celInfo->offsetLiteral) { // no additional literal data - if (_resMan->isAmiga32color()) { + if (_resMan->getViewType() == kViewAmiga) { // decompression for amiga views while (pixelNo < pixelCount) { pixel = *rlePtr++; @@ -531,9 +531,8 @@ const byte *GfxView::getBitmap(int16 loopNo, int16 celNo) { // unpack the actual cel bitmap data unpackCel(loopNo, celNo, pBitmap, pixelCount); - if (!_resMan->isVGA()) { + if (_resMan->getViewType() == kViewEga) unditherBitmap(pBitmap, width, height, _loop[loopNo].cel[celNo].clearKey); - } // mirroring the cel if needed if (_loop[loopNo].mirrorFlag) { |