aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2016-09-20 20:56:32 -0400
committerPaul Gilbert2016-09-20 20:56:32 -0400
commit2cd89a4995cbd431af723baad93d063295efa49d (patch)
tree6371b86229bed9e329bd36fad13ba360bc21962b /engines
parent18b272da29651f66c6dffb868367bf4076b4878c (diff)
downloadscummvm-rg350-2cd89a4995cbd431af723baad93d063295efa49d.tar.gz
scummvm-rg350-2cd89a4995cbd431af723baad93d063295efa49d.tar.bz2
scummvm-rg350-2cd89a4995cbd431af723baad93d063295efa49d.zip
XEEN: Fix vertical gfx merging
Diffstat (limited to 'engines')
-rw-r--r--engines/xeen/screen.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/xeen/screen.cpp b/engines/xeen/screen.cpp
index 61bb483767..12df704204 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);