[Scummvm-cvs-logs] scummvm master -> c1e895d7992bd5937604eb8d64cdc1c1611a11bd

[m-kiewitz]

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:
c1e895d799 SCI: fix regression introduced by 480x300 commit


Commit: c1e895d7992bd5937604eb8d64cdc1c1611a11bd
    https://github.com/scummvm/scummvm/commit/c1e895d7992bd5937604eb8d64cdc1c1611a11bd
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2014-06-02T01:37:08+02:00

Commit Message:
SCI: fix regression introduced by 480x300 commit

fix EGA graphic corruption

Changed paths:
    engines/sci/graphics/screen.cpp



diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 6b1cab9..806881c 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -624,7 +624,6 @@ void GfxScreen::dither(bool addToFlag) {
 					switch (_upscaledHires) {
 					case GFX_SCREEN_UPSCALED_DISABLED:
 						*displayPtr = color;
-						displayPtr++;
 						break;
 					default:
 						putScaledPixelOnDisplay(x, y, color);
@@ -632,7 +631,7 @@ void GfxScreen::dither(bool addToFlag) {
 					}
 					*visualPtr = color;
 				}
-				visualPtr++;
+				visualPtr++; displayPtr++;
 			}
 		}
 	} else {
@@ -656,7 +655,6 @@ void GfxScreen::dither(bool addToFlag) {
 					switch (_upscaledHires) {
 					case GFX_SCREEN_UPSCALED_DISABLED:
 						*displayPtr = ditheredColor;
-						displayPtr++;
 						break;
 					default:
 						putScaledPixelOnDisplay(x, y, ditheredColor);
@@ -665,7 +663,7 @@ void GfxScreen::dither(bool addToFlag) {
 					color = ((x^y) & 1) ? color >> 4 : color & 0x0F;
 					*visualPtr = color;
 				}
-				visualPtr++;
+				visualPtr++; displayPtr++;
 			}
 		}
 	}