diff options
| author | Colin Snover | 2016-07-31 15:19:48 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-08-19 13:57:40 -0500 |
| commit | 89a82f5b55f95cd1b68374b670299ddc005fe1fb (patch) | |
| tree | c2eaf6f5710d996d3159fcc907e4cf78b421be0c /engines | |
| parent | ff00e93c677e9437aee256b3ff9f1bce7e9b5032 (diff) | |
| download | scummvm-rg350-89a82f5b55f95cd1b68374b670299ddc005fe1fb.tar.gz scummvm-rg350-89a82f5b55f95cd1b68374b670299ddc005fe1fb.tar.bz2 scummvm-rg350-89a82f5b55f95cd1b68374b670299ddc005fe1fb.zip | |
SCI32: Fix signature of kSetNowSeen
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/graphics/frameout.cpp | 5 | ||||
| -rw-r--r-- | engines/sci/graphics/frameout.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index e9234d92b7..4bd7b46914 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -1332,7 +1332,7 @@ bool GfxFrameout::isOnMe(const ScreenItem &screenItem, const Plane &plane, const return true; } -void GfxFrameout::kernelSetNowSeen(const reg_t screenItemObject) const { +bool GfxFrameout::kernelSetNowSeen(const reg_t screenItemObject) const { const reg_t planeObject = readSelector(_segMan, screenItemObject, SELECTOR(plane)); Plane *plane = _planes.findByObject(planeObject); @@ -1342,7 +1342,7 @@ void GfxFrameout::kernelSetNowSeen(const reg_t screenItemObject) const { ScreenItem *screenItem = plane->_screenItemList.findByObject(screenItemObject); if (screenItem == nullptr) { - error("kSetNowSeen: Screen item %04x:%04x not found in plane %04x:%04x", PRINT_REG(screenItemObject), PRINT_REG(planeObject)); + return false; } Common::Rect result = screenItem->getNowSeenRect(*plane); @@ -1350,6 +1350,7 @@ void GfxFrameout::kernelSetNowSeen(const reg_t screenItemObject) const { writeSelectorValue(_segMan, screenItemObject, SELECTOR(nsTop), result.top); writeSelectorValue(_segMan, screenItemObject, SELECTOR(nsRight), result.right - 1); writeSelectorValue(_segMan, screenItemObject, SELECTOR(nsBottom), result.bottom - 1); + return true; } void GfxFrameout::remapMarkRedraw() { diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h index 6cd0416a7a..de90fc7414 100644 --- a/engines/sci/graphics/frameout.h +++ b/engines/sci/graphics/frameout.h @@ -113,7 +113,7 @@ public: void kernelAddScreenItem(const reg_t object); void kernelUpdateScreenItem(const reg_t object); void kernelDeleteScreenItem(const reg_t object); - void kernelSetNowSeen(const reg_t screenItemObject) const; + bool kernelSetNowSeen(const reg_t screenItemObject) const; #pragma mark - #pragma mark Planes |