aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/screen.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-12-26 18:57:58 +1100
committerPaul Gilbert2014-12-26 18:57:58 +1100
commitcadb7176bc6336de2ee05c3465e9954157a8e4a6 (patch)
treee8c3ce30ad1e6d88b2270b7d428a99efbfda11b4 /engines/xeen/screen.cpp
parent1a6dd88713ff6a6994f9e4d69abf8e3c66538bb2 (diff)
downloadscummvm-rg350-cadb7176bc6336de2ee05c3465e9954157a8e4a6.tar.gz
scummvm-rg350-cadb7176bc6336de2ee05c3465e9954157a8e4a6.tar.bz2
scummvm-rg350-cadb7176bc6336de2ee05c3465e9954157a8e4a6.zip
XEEN: Fix error in vertMerge
Diffstat (limited to 'engines/xeen/screen.cpp')
-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 e390f16cdd..5276b6971f 100644
--- a/engines/xeen/screen.cpp
+++ b/engines/xeen/screen.cpp
@@ -141,8 +141,8 @@ void Screen::horizMerge(int xp) {
Common::copy(srcP, srcP + SCREEN_WIDTH - xp, destP);
if (xp != 0) {
- srcP = (const byte *)_pages[1].getBasePtr(xp, y);
- Common::copy(srcP, srcP + SCREEN_WIDTH - xp, destP + xp);
+ srcP = (const byte *)_pages[1].getBasePtr(0, y);
+ Common::copy(srcP + SCREEN_WIDTH - xp, srcP + SCREEN_WIDTH, destP + SCREEN_WIDTH - xp);
}
}
}