aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2009-10-25 19:49:09 +0000
committerMartin Kiewitz2009-10-25 19:49:09 +0000
commit5a465c86c2c8ed5fe3fb1b7713201ffeccb3703f (patch)
treead75fbc1a529fd6c86efb9f66cf754749c904023 /engines/sci
parentce9dcd7aa844c09167558a1fac5a1aadb16b52a9 (diff)
downloadscummvm-rg350-5a465c86c2c8ed5fe3fb1b7713201ffeccb3703f.tar.gz
scummvm-rg350-5a465c86c2c8ed5fe3fb1b7713201ffeccb3703f.tar.bz2
scummvm-rg350-5a465c86c2c8ed5fe3fb1b7713201ffeccb3703f.zip
SCI/newgui: SciGuiView disable undithering when EGA mappings are available (support needs to get implemented for this case), also fixes a part of the undithering code
svn-id: r45374
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/gui/gui_view.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/sci/gui/gui_view.cpp b/engines/sci/gui/gui_view.cpp
index 0544958049..788034871c 100644
--- a/engines/sci/gui/gui_view.cpp
+++ b/engines/sci/gui/gui_view.cpp
@@ -373,6 +373,10 @@ void SciGuiView::unditherBitmap(byte *bitmapPtr, int16 width, int16 height, byte
// Makes no sense to process bitmaps that are 3 pixels wide or less
if (width <= 3) return;
+ // TODO: Implement ability to undither bitmaps when EGAmappings are set (qfg2)
+ if (_EGAmapping)
+ return;
+
// Walk through the bitmap and remember all combinations of colors
int16 bitmapMemorial[SCI_SCREEN_UNDITHERMEMORIAL_SIZE];
byte *curPtr;
@@ -384,7 +388,7 @@ void SciGuiView::unditherBitmap(byte *bitmapPtr, int16 width, int16 height, byte
// Count all seemingly dithered pixel-combinations as soon as at least 4 pixels are adjacent
curPtr = bitmapPtr;
for (y = 0; y < height; y++) {
- color1 = (curPtr[0] << 8) | (curPtr[1] << 4); color2 = curPtr[2];
+ color1 = curPtr[0]; color2 = (curPtr[1] << 4) | curPtr[2];
curPtr += 3;
for (x = 3; x < width; x++) {
color1 = (color1 << 4) | (color2 >> 4);