From 622f3ec78fe4e8cc3e299a3dd4008d7a854928d8 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Thu, 24 Jun 2004 12:32:19 +0000 Subject: [PATCH] Fix mouse cursors hotspot in HE games. HE games don't change cursor hotspot, when changing cursor image. svn-id: r14027 --- scumm/cursor.cpp | 5 ----- scumm/object.cpp | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scumm/cursor.cpp b/scumm/cursor.cpp index b2c6f29676b..0a0fbe47e32 100644 --- a/scumm/cursor.cpp +++ b/scumm/cursor.cpp @@ -160,11 +160,6 @@ void ScummEngine::setCursor(int cursor) { void ScummEngine::setCursorHotspot(int x, int y) { _cursor.hotspotX = x; _cursor.hotspotY = y; - // FIXME this hacks around offset cursor in the humongous games - if (_features & GF_HUMONGOUS) { - _cursor.hotspotX += 15; - _cursor.hotspotY += 15; - } } void ScummEngine::updateCursor() { diff --git a/scumm/object.cpp b/scumm/object.cpp index c2b1ec747a9..1f59bdb41ca 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -1388,8 +1388,9 @@ void ScummEngine::setCursorImg(uint img, uint room, uint imgindex) { w = READ_LE_UINT16(&foir.imhd->v7.width) / 8; h = READ_LE_UINT16(&foir.imhd->v7.height) / 8; } else { - setCursorHotspot(READ_LE_UINT16(&foir.imhd->old.hotspot[0].x), - READ_LE_UINT16(&foir.imhd->old.hotspot[0].y)); + if (!(_features & GF_HUMONGOUS)) + setCursorHotspot(READ_LE_UINT16(&foir.imhd->old.hotspot[0].x), + READ_LE_UINT16(&foir.imhd->old.hotspot[0].y)); w = READ_LE_UINT16(&foir.cdhd->v6.w) / 8; h = READ_LE_UINT16(&foir.cdhd->v6.h) / 8; }