[Scummvm-cvs-logs] scummvm master -> 300cec119c029008853f36a31084d767332aa73c

bluegr md5 at scummvm.org
Sun Sep 25 03:16:36 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
300cec119c SCI: Bugfix for the palette of Longbow Amiga (still not right)


Commit: 300cec119c029008853f36a31084d767332aa73c
    https://github.com/scummvm/scummvm/commit/300cec119c029008853f36a31084d767332aa73c
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-09-24T18:10:20-07:00

Commit Message:
SCI: Bugfix for the palette of Longbow Amiga (still not right)

Changed paths:
    engines/sci/graphics/palette.cpp
    engines/sci/graphics/picture.cpp



diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 3891959..c667e33 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 ecb54e8..dad2b77 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;
 						}






More information about the Scummvm-git-logs mailing list