[Scummvm-git-logs] scummvm master -> 2cd89a4995cbd431af723baad93d063295efa49d

[dreammaster]

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:
2cd89a4995 XEEN: Fix vertical gfx merging


Commit: 2cd89a4995cbd431af723baad93d063295efa49d
    https://github.com/scummvm/scummvm/commit/2cd89a4995cbd431af723baad93d063295efa49d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-20T20:56:32-04:00

Commit Message:
XEEN: Fix vertical gfx merging

Changed paths:
    engines/xeen/screen.cpp



diff --git a/engines/xeen/screen.cpp b/engines/xeen/screen.cpp
index 61bb483..12df704 100644
--- a/engines/xeen/screen.cpp
+++ b/engines/xeen/screen.cpp
@@ -393,12 +393,12 @@ void Screen::vertMerge(int yp) {
 		return;
 
 	for (int y = 0; y < SCREEN_HEIGHT - yp; ++y) {
-		const byte *srcP = (const byte *)_pages[0].getBasePtr(0, y);
+		const byte *srcP = (const byte *)_pages[0].getBasePtr(0, yp + y);
 		byte *destP = (byte *)getBasePtr(0, y);
 		Common::copy(srcP, srcP + SCREEN_WIDTH, destP);
 	}
 
-	for (int y = 0; y < (SCREEN_HEIGHT - yp); ++y) {
+	for (int y = 0; y < yp; ++y) {
 		const byte *srcP = (const byte *)_pages[1].getBasePtr(0, y);
 		byte *destP = (byte *)getBasePtr(0, SCREEN_HEIGHT - yp + y);
 		Common::copy(srcP, srcP + SCREEN_WIDTH, destP);