From abefac8cd079ef786cdb9218d7bf665cd5df40e0 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 22 Sep 2004 00:22:32 +0000
Subject: Add missing cases

svn-id: r15227
---
 scumm/script_v80he.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'scumm/script_v80he.cpp')

diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 882cc13c6f..e5282e0724 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -559,29 +559,30 @@ void ScummEngine_v80he::o80_cursorCommand() {
 	VAR(VAR_USERPUT) = _userPut;
 }
 
-void ScummEngine_v80he::loadImgSpot(int resId, int state, Common::Point &spot) {
+void ScummEngine_v80he::loadImgSpot(int resId, int state, uint32 &w, uint32 &h) {
 	const uint8 *dataPtr = getResourceAddress(rtImage, resId);
 	if (!dataPtr)
 		error("loadImgSpot: unknown Image %d", resId);
 
 	const uint8 *spotPtr = findWrappedBlock(MKID('SPOT'), dataPtr, state, 0);
 
-	if (!spotPtr) {
-		spot.x = spot.y = 0;
+	if (spotPtr) {
+		w = (int16)READ_LE_UINT32(spotPtr + 0);
+		h = (int16)READ_LE_UINT32(spotPtr + 4);
 	} else {
-		spot.x = (int16)READ_LE_UINT32(spotPtr + 0);
-		spot.y = (int16)READ_LE_UINT32(spotPtr + 4);
+		w = 0;
+		h = 0;
 	}
 }
 
 void ScummEngine_v80he::loadWizCursor(int resId, int resType, bool state) {
 	Common::Rect rc;
-	Common::Point spot;
+	uint32 w, h;
 
-	loadImgSpot(resId, 0, spot);
+	loadImgSpot(resId, 0, w, h);
 
-	rc.top = spot.x;
-	rc.right = spot.y;
+	rc.top = w;
+	rc.right = h;
 
 	rc.top = MAX((int)rc.top, 0);
 	rc.right = MAX((int)rc.right, 0);
-- 
cgit v1.2.3