aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2011-09-25 04:09:29 +0300
committerFilippos Karapetis2011-09-25 04:10:20 +0300
commit300cec119c029008853f36a31084d767332aa73c (patch)
treed53a549a659c0c91e2cf5e1ae75450523a9f7655 /engines
parent460c4eca26fa4578dc5fccf45279aa59a950d0f4 (diff)
downloadscummvm-rg350-300cec119c029008853f36a31084d767332aa73c.tar.gz
scummvm-rg350-300cec119c029008853f36a31084d767332aa73c.tar.bz2
scummvm-rg350-300cec119c029008853f36a31084d767332aa73c.zip
SCI: Bugfix for the palette of Longbow Amiga (still not right)
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/graphics/palette.cpp2
-rw-r--r--engines/sci/graphics/picture.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 38919593b4..c667e3313f 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -114,7 +114,7 @@ bool GfxPalette::isMerging() {
void GfxPalette::setDefault() {
if (_resMan->getViewType() == kViewEga)
setEGA();
- else if (_resMan->getViewType() == kViewAmiga)
+ else if (_resMan->getViewType() == kViewAmiga || _resMan->getViewType() == kViewAmiga64)
setAmiga();
else
kernelSetFromResource(999, true);
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index ecb54e89e8..dad2b77036 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -740,7 +740,7 @@ void GfxPicture::drawVectorData(byte *data, int dataSize) {
// Left-Over VGA palette, we simply ignore it
curPos += 256 + 4 + 1024;
} else {
- // Setting half of the amiga palette
+ // Setting half of the Amiga palette
_palette->modifyAmigaPalette(&data[curPos]);
curPos += 32;
}