diff options
| author | Paul Gilbert | 2014-01-18 07:58:16 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-01-18 07:58:16 -0500 |
| commit | 8792e4f97b7ad3cb1863dd0ccf15adaac7f6a061 (patch) | |
| tree | 5c49225a911eabd3f2ee13df434a7814c41b9c47 /engines | |
| parent | 7ad8dfa0a720ea5b7db502424ba73fb7059824b6 (diff) | |
| download | scummvm-rg350-8792e4f97b7ad3cb1863dd0ccf15adaac7f6a061.tar.gz scummvm-rg350-8792e4f97b7ad3cb1863dd0ccf15adaac7f6a061.tar.bz2 scummvm-rg350-8792e4f97b7ad3cb1863dd0ccf15adaac7f6a061.zip | |
VOYEUR: Fix anonymous resource in reviewTape to a hotspot list
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/voyeur/voyeur.h | 3 | ||||
| -rw-r--r-- | engines/voyeur/voyeur_game.cpp | 17 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/voyeur/voyeur.h b/engines/voyeur/voyeur.h index 1622524108..33e924a26d 100644 --- a/engines/voyeur/voyeur.h +++ b/engines/voyeur/voyeur.h @@ -112,6 +112,9 @@ private: */ void doPiracy(); + /** + * Review previous tape recordings on the TV + */ void reviewTape(); /** diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp index ca8737389a..f31e67b0fc 100644 --- a/engines/voyeur/voyeur_game.cpp +++ b/engines/voyeur/voyeur_game.cpp @@ -433,11 +433,11 @@ void VoyeurEngine::reviewTape() { if ((si + _voy._eventCount) <= 7) var20 = si + _voy._eventCount - 1; + _voy._viewBounds = _bVoy->boltEntry(0x907)._rectResource; + Common::Array<Common::Rect> &hotspots = _bVoy->boltEntry(0x906)._rectResource->_entries; + bool breakFlag = false; while (!shouldQuit() && !breakFlag) { - _voy._viewBounds = _bVoy->boltEntry(0x907)._rectResource; - byte *dataP = _bVoy->memberAddr(0x906); - int varA = READ_LE_UINT16(dataP); _graphicsManager._backColors = _bVoy->boltEntry(0x902)._cMapResource; _graphicsManager._backgroundPage = _bVoy->boltEntry(0x901)._picResource; (*_graphicsManager._vPort)->setupViewPort(_graphicsManager._backgroundPage); @@ -463,8 +463,7 @@ void VoyeurEngine::reviewTape() { _eventsManager.getMouseInfo(); if (newX == -1) { - _eventsManager.setMousePos(Common::Point((int16)READ_LE_UINT16(dataP + 10) + 12, - (int16)READ_LE_UINT16(dataP + 12) + 6)); + _eventsManager.setMousePos(Common::Point(hotspots[1].left + 12, hotspots[1].top + 6)); } else { _eventsManager.setMousePos(Common::Point(newX, newY)); } @@ -523,11 +522,8 @@ void VoyeurEngine::reviewTape() { _eventsManager.getMouseInfo(); foundIndex = -1; Common::Point tempPos = _eventsManager.getMousePos() + Common::Point(14, 7); - for (int idx = 0; idx < varA; ++idx) { - if (READ_LE_UINT16(dataP + idx * 8 + 2) <= tempPos.x && - READ_LE_UINT16(dataP + idx * 8 + 6) >= tempPos.x && - READ_LE_UINT16(dataP + idx * 8 + 4) <= tempPos.y && - READ_LE_UINT16(dataP + idx * 8 + 4) <= tempPos.y) { + for (uint idx = 0; idx < hotspots.size(); ++idx) { + if (hotspots[idx].contains(tempPos)) { // Found hotspot area foundIndex = idx; break; @@ -552,6 +548,7 @@ void VoyeurEngine::reviewTape() { _graphicsManager._drawPtr->_penColor = 0; _graphicsManager._drawPtr->_pos = Common::Point(tempRect.left, tempRect.top); + // TODO: Does sFillBox need to work on picture resources? ((ViewPortResource *)_graphicsManager._backgroundPage)->sFillBox(tempRect.width(), tempRect.height()); |