diff options
| author | Travis Howell | 2004-09-22 00:22:32 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-09-22 00:22:32 +0000 |
| commit | abefac8cd079ef786cdb9218d7bf665cd5df40e0 (patch) | |
| tree | 2196f5c79b26b96562855388e4c970733849c407 /scumm/script_v80he.cpp | |
| parent | 6bfeab77e1d38d8f1583f2e5214764dcacf05d4a (diff) | |
| download | scummvm-rg350-abefac8cd079ef786cdb9218d7bf665cd5df40e0.tar.gz scummvm-rg350-abefac8cd079ef786cdb9218d7bf665cd5df40e0.tar.bz2 scummvm-rg350-abefac8cd079ef786cdb9218d7bf665cd5df40e0.zip | |
Add missing cases
svn-id: r15227
Diffstat (limited to 'scumm/script_v80he.cpp')
| -rw-r--r-- | scumm/script_v80he.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
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); |