[Scummvm-cvs-logs] SF.net SVN: scummvm: [23825] scummvm/trunk/engines/lure/menu.cpp
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Sun Sep 3 07:05:06 CEST 2006
Revision: 23825
http://svn.sourceforge.net/scummvm/?rev=23825&view=rev
Author: dreammaster
Date: 2006-09-02 22:04:58 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
Bugfix to only list rooms that have been found in the Tell action 'Go To' command
Modified Paths:
--------------
scummvm/trunk/engines/lure/menu.cpp
Modified: scummvm/trunk/engines/lure/menu.cpp
===================================================================
--- scummvm/trunk/engines/lure/menu.cpp 2006-09-03 05:03:50 UTC (rev 23824)
+++ scummvm/trunk/engines/lure/menu.cpp 2006-09-03 05:04:58 UTC (rev 23825)
@@ -290,11 +290,10 @@
// 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 @@
((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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list