aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2008-03-20 12:07:06 +0000
committerJohannes Schickel2008-03-20 12:07:06 +0000
commit558625ff45946301b0dc10b44f7e3ebda90319a1 (patch)
tree012262c296fbf3a1b25e939462ff91bd3fdf552d
parent4669f2a659cd2682dcd362e14456c645c021ccee (diff)
downloadscummvm-rg350-558625ff45946301b0dc10b44f7e3ebda90319a1.tar.gz
scummvm-rg350-558625ff45946301b0dc10b44f7e3ebda90319a1.tar.bz2
scummvm-rg350-558625ff45946301b0dc10b44f7e3ebda90319a1.zip
Fixed bug #1920869 "HoF: palette artifacts in inventory".
svn-id: r31204
-rw-r--r--engines/kyra/gui_v2.cpp2
-rw-r--r--engines/kyra/screen_v2.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index 86c019452b..ba73be52d7 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -738,7 +738,7 @@ void KyraEngine_v2::scrollInventoryWheel() {
int frames = movie.opened() ? movie.frames() : 6;
memcpy(_screenBuffer, _screen->getCPagePtr(2), 64000);
uint8 overlay[0x100];
- _screen->generateOverlay(_screen->getPalette(0), overlay, 0, 32);
+ _screen->generateOverlay(_screen->getPalette(0), overlay, 0, 50);
_screen->hideMouse();
_screen->copyRegion(0x46, 0x90, 0x46, 0x79, 0x71, 0x17, 0, 2);
_screen->showMouse();
diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp
index ab46dce6f3..a76c764765 100644
--- a/engines/kyra/screen_v2.cpp
+++ b/engines/kyra/screen_v2.cpp
@@ -152,7 +152,7 @@ uint8 *Screen_v2::generateOverlay(const uint8 *palette, uint8 *buffer, int start
}
void Screen_v2::applyOverlay(int x, int y, int w, int h, int pageNum, const uint8 *overlay) {
- uint8 * dst = getPagePtr(pageNum) + y * 320 + x;
+ uint8 *dst = getPagePtr(pageNum) + y * 320 + x;
while (h--) {
for (int wi = 0; wi < w; ++wi) {
uint8 index = *dst;