get rid of the dirty hack needed to display wiz cursors in HE games

svn-id: r15269

2 files changed, 5 insertions, 9 deletions

diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 9051aca320..0106129f46 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -1450,12 +1450,6 @@ uint8 *ScummEngine_v72he::drawWizImage(int restype, int resnum, int state, int x
 			if (flags & 0x20) {
 				int color = 255; // FIXME: should be (VAR_WIZ_TCOLOR != 0xFF) ? VAR(VAR_WIZ_TCOLOR) : 5;
 				memset(dst, color, width * height);
-
-				// FIXME: dirty hack until missing bits are implemented
-				Common::Rect rScreen(0, 0, width-1, height-1);
-				gdi.copyWizImage(dst, wizd, width, height, 0, 0, width, height, &rScreen);
-				setCursorFromBuffer(dst, width, height, width);
-				// FIXME: ensure that caller frees the returned pointer
 			}
 			cw = width;
 			ch = height;
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 728f49700c..fccf502a0d 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -592,10 +592,12 @@ void ScummEngine_v80he::loadWizCursor(int resId, int resType, bool state) {
 	rc.top = MIN((int)rc.top, 32);
 	rc.right = MIN((int)rc.right, 32);
 
-	// FIXME: dirty hack. Cursor is set in drawWizImage, though should be set from here
-	// it is unclear how height and width are passed from drawWizImage
-	drawWizImage(rtImage, resId, 0, 0, 0, 0x20);
+	uint8 *cursor = drawWizImage(rtImage, resId, 0, 0, 0, 0x20);
+	uint32 cw, ch;
+	getWizImageDim(resId, 0, cw, ch);
+	setCursorFromBuffer(cursor, cw, ch, cw);
 	setCursorHotspot(rc.top, rc.right);
+	free(cursor);
 }
 
 void ScummEngine_v80he::o80_setState() {