diff options
| author | Paul Gilbert | 2014-02-02 19:01:01 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-02-02 19:01:01 -0500 |
| commit | 569fa63a3a00cdba1d2e3c87941f300e4bfb1a4d (patch) | |
| tree | 24acbdda6772ab70d2e32fa09bc0465c22138826 | |
| parent | 2b69c5d07cb72b97690517cdf1f9d3d40f172029 (diff) | |
| download | scummvm-rg350-569fa63a3a00cdba1d2e3c87941f300e4bfb1a4d.tar.gz scummvm-rg350-569fa63a3a00cdba1d2e3c87941f300e4bfb1a4d.tar.bz2 scummvm-rg350-569fa63a3a00cdba1d2e3c87941f300e4bfb1a4d.zip | |
VOYEUR: Fix for not highlighting camera on Monday morning after loading savegame
| -rw-r--r-- | engines/voyeur/files_threads.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index 6c39a97689..e99a19f94f 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -1016,15 +1016,20 @@ int ThreadResource::doApt() { hotspotId = -1; pt = _vm->_eventsManager.getMousePos(); for (int idx = 0; idx < (int)hotspots.size(); ++idx) { - if (pt.x > hotspots[idx].left && pt.x < hotspots[idx].right && - pt.y > hotspots[idx].top && pt.y < hotspots[idx].bottom) { + if (hotspots[idx].contains(pt)) { // Cursor is within hotspot area + + // Don't allow the camera to be highlighted on Monday morning. + if (idx == 0 && _vm->_voy._transitionId == 17) + continue; + + // Set the highlighted hotspot Id hotspotId = idx; if (hotspotId != prevHotspotId) { // Check for whether to replace hotspot Id for "Watch TV" for // "Review the Tape" if player has already watched the TV - if ((_vm->_voy._eventFlags & 0x100) && (hotspotId == 2)) + if ((_vm->_voy._eventFlags & EVTFLAG_100) && (hotspotId == 2)) hotspotId = 5; // Draw the text description for the highlighted hotspot |