aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2009-07-04 17:39:43 +0000
committerFilippos Karapetis2009-07-04 17:39:43 +0000
commit177891a0c1b0a6b03e03b2a81520a1f51ff3ee00 (patch)
treee2edc04f00dcae748d146e26e210560629e5eb23 /engines
parentb0c908e3493cd9673d92b9752006d373672ffb85 (diff)
downloadscummvm-rg350-177891a0c1b0a6b03e03b2a81520a1f51ff3ee00.tar.gz
scummvm-rg350-177891a0c1b0a6b03e03b2a81520a1f51ff3ee00.tar.bz2
scummvm-rg350-177891a0c1b0a6b03e03b2a81520a1f51ff3ee00.zip
Cursors without a palette are now initialized correctly (from patch #2816652). Fixes the cursor transparent color in QFG3
svn-id: r42099
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/gfx/gfx_driver.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/sci/gfx/gfx_driver.cpp b/engines/sci/gfx/gfx_driver.cpp
index 3420472943..c665eef3b8 100644
--- a/engines/sci/gfx/gfx_driver.cpp
+++ b/engines/sci/gfx/gfx_driver.cpp
@@ -257,15 +257,14 @@ int GfxDriver::setPointer(gfx_pixmap_t *pointer, Common::Point *hotspot) {
} else {
byte *cursorData = createCursor(pointer);
- // FIXME: The palette size check is a workaround for cursors using non-palette colour GFX_CURSOR_TRANSPARENT
- // Note that some cursors don't have a palette in SQ5
+ // FIXME: The palette size check is a workaround for cursors using non-palette color GFX_CURSOR_TRANSPARENT
+ // Note that some cursors don't have a palette (e.g. in SQ5 and QFG3)
byte color_key = GFX_CURSOR_TRANSPARENT;
if ((pointer->color_key != GFX_PIXMAP_COLOR_KEY_NONE) && (pointer->palette && (unsigned int)pointer->color_key < pointer->palette->size()))
color_key = pointer->palette->getColor(pointer->color_key).parent_index;
- // Some cursors in SQ5 don't have a palette. The cursor palette seems to use 64 colors, so setting the color key to 63 works
- // TODO: Is this correct?
+ // Some cursors don't have a palette, so we set the color key directly
if (!pointer->palette)
- color_key = 63;
+ color_key = pointer->color_key;
CursorMan.replaceCursor(cursorData, pointer->width, pointer->height, hotspot->x, hotspot->y, color_key);
CursorMan.showMouse(true);