diff options
| author | Paul Gilbert | 2006-09-03 05:04:58 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2006-09-03 05:04:58 +0000 |
| commit | 816cc1a62c3e0a48d50c77a92538b4ada4783fe1 (patch) | |
| tree | cebda1e692d08fdfaba5807da43ddd6f3ad46b4d /engines | |
| parent | e5fcd5ff2d01118ffc155f859e7b38566ac8f2cb (diff) | |
| download | scummvm-rg350-816cc1a62c3e0a48d50c77a92538b4ada4783fe1.tar.gz scummvm-rg350-816cc1a62c3e0a48d50c77a92538b4ada4783fe1.tar.bz2 scummvm-rg350-816cc1a62c3e0a48d50c77a92538b4ada4783fe1.zip | |
Bugfix to only list rooms that have been found in the Tell action 'Go To' command
svn-id: r23825
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lure/menu.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index 132bb87e8a..cf694428b1 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -290,11 +290,10 @@ uint16 PopupMenu::ShowItems(Action contextAction) { // Loop for rooms for (ir = rooms.begin(); ir != rooms.end(); ++ir) { RoomData *roomData = *ir; - // Pre-condition checks for whether to skip room if ((roomData->hdrFlags != 15) && ((roomData->hdrFlags & fields.hdrFlagMask()) == 0)) continue; - if ((roomData->flags & (0x20 | 0x80)) != 0) + if (((roomData->flags & HOTSPOTFLAG_20) != 0) || ((roomData->flags & HOTSPOTFLAG_FOUND) == 0)) continue; if ((roomData->actions & contextBitflag) == 0) continue; @@ -316,7 +315,7 @@ uint16 PopupMenu::ShowItems(Action contextAction) { ((hotspot->headerFlags & fields.hdrFlagMask()) == 0)) continue; - if (((hotspot->flags & 0x20) != 0) || ((hotspot->flags & 0x80) == 0)) + if (((hotspot->flags & HOTSPOTFLAG_20) != 0) || ((hotspot->flags & HOTSPOTFLAG_FOUND) == 0)) // Skip the current hotspot continue; |