diff options
Diffstat (limited to 'engines/voyeur')
| -rw-r--r-- | engines/voyeur/debugger.cpp | 1 | ||||
| -rw-r--r-- | engines/voyeur/files_threads.cpp | 9 | ||||
| -rw-r--r-- | engines/voyeur/voyeur_game.cpp | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/engines/voyeur/debugger.cpp b/engines/voyeur/debugger.cpp index 04fdff2d49..f97e73a5ce 100644 --- a/engines/voyeur/debugger.cpp +++ b/engines/voyeur/debugger.cpp @@ -63,6 +63,7 @@ bool Debugger::Cmd_Time(int argc, const char **argv) { _vm->_gameMinute = LEVEL_M[timeId - 1]; _vm->_voy._isAM = timeId == 6; + // Camera back to full charge _vm->_voy._RTVNum = 0; _vm->_voy._RTANum = 255; diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index b7d1402b35..48eee998d5 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -1378,7 +1378,7 @@ int ThreadResource::doInterface() { _vm->_eventsManager.getMouseInfo(); _vm->initIFace(); - Common::Array<Common::Rect> &hotspots = _vm->_bVoy->boltEntry( + Common::Array<Common::Rect> *hotspots = &_vm->_bVoy->boltEntry( _vm->_playStamp1 + 1)._rectResource->_entries; _vm->_playStamp2 = 151 - _vm->getRandomNumber(5); _vm->_voy._vocSecondsOffset = _vm->getRandomNumber(29); @@ -1399,7 +1399,6 @@ int ThreadResource::doInterface() { PictureResource *mangifyCursor = _vm->_bVoy->boltEntry(0x115)._picResource; _vm->_eventsManager.setCursor(crosshairsCursor); - _vm->_eventsManager.showCursor(); // Main loop int priorRegionIndex = -1; @@ -1431,8 +1430,8 @@ int ThreadResource::doInterface() { Common::Point(pt.x - MANSION_VIEW_X, pt.y - MANSION_VIEW_Y); regionIndex = -1; - for (int idx = 0; idx < (int)hotspots.size(); ++idx) { - if (hotspots[idx].contains(pt)) { + for (int idx = 0; idx < (int)hotspots->size(); ++idx) { + if ((*hotspots)[idx].contains(pt)) { // Rect check done for (int arrIndex = 0; arrIndex < 3; ++arrIndex) { if (_vm->_voy._arr3[arrIndex][idx] <= _vm->_voy._RTVNum && @@ -1511,7 +1510,7 @@ int ThreadResource::doInterface() { _vm->initIFace(); - hotspots = _vm->_bVoy->boltEntry(_vm->_playStamp1 + 1)._rectResource->_entries; + hotspots = &_vm->_bVoy->boltEntry(_vm->_playStamp1 + 1)._rectResource->_entries; _vm->_eventsManager.getMouseInfo(); _vm->_voy._field478 &= ~2; diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp index 9364247ba6..25ad3310ac 100644 --- a/engines/voyeur/voyeur_game.cpp +++ b/engines/voyeur/voyeur_game.cpp @@ -1028,6 +1028,9 @@ void VoyeurEngine::initIFace(){ _voy._viewBounds = _bVoy->boltEntry(_playStamp1)._rectResource; + // Show the cursor using ScummVM functionality + _eventsManager.showCursor(); + // Note: the original did two loops to preload members here, which is // redundant for ScummVM, since computers are faster these days, and // getting resources as needed will be fast enough. |