[Scummvm-cvs-logs] SF.net SVN: scummvm: [23630] scummvm/trunk/engines/lure
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Sun Jul 30 14:12:27 CEST 2006
Revision: 23630
Author: dreammaster
Date: 2006-07-30 05:12:18 -0700 (Sun, 30 Jul 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23630&view=rev
Log Message:
-----------
Added constants for known hotspot flags, and added line to flag hotspots that have been highlighted with the cursor
Modified Paths:
--------------
scummvm/trunk/engines/lure/luredefs.h
scummvm/trunk/engines/lure/room.cpp
Modified: scummvm/trunk/engines/lure/luredefs.h
===================================================================
--- scummvm/trunk/engines/lure/luredefs.h 2006-07-30 12:10:44 UTC (rev 23629)
+++ scummvm/trunk/engines/lure/luredefs.h 2006-07-30 12:12:18 UTC (rev 23630)
@@ -253,6 +253,11 @@
// Pixel record flags
#define PIXELFLAG_HAS_TABLE 4
+// Hotspot flags
+#define HOTSPOTFLAG_HIGHLIGHTED 0x80
+#define HOTSPOTFLAG_SKIP 0x40
+#define HOTSPOTFLAG_20 0x20
+
// Constants used to reference entries in the reworked support data entry lists
#define RETURN_SUPPORT_ID 0x400
#define EXIT_BLOCKED_SUPPORT_ID 0x800
Modified: scummvm/trunk/engines/lure/room.cpp
===================================================================
--- scummvm/trunk/engines/lure/room.cpp 2006-07-30 12:10:44 UTC (rev 23629)
+++ scummvm/trunk/engines/lure/room.cpp 2006-07-30 12:12:18 UTC (rev 23630)
@@ -166,9 +166,9 @@
bool skipFlag = (entry->roomNumber != _roomNumber);
if (!skipFlag) {
- skipFlag = (((entry->flags & 0x80) == 0) &&
- ((entry->flags & 0x40) != 0)) ||
- ((entry->flags & 0x20) != 0);
+ skipFlag = (((entry->flags & HOTSPOTFLAG_HIGHLIGHTED) == 0) &&
+ ((entry->flags & HOTSPOTFLAG_SKIP) != 0)) ||
+ ((entry->flags & HOTSPOTFLAG_20) != 0);
}
if ((!skipFlag) && (entry->hotspotId < 0x409))
@@ -218,6 +218,7 @@
_hotspot = entry;
_hotspotId = entry->hotspotId;
_isExit = false;
+ entry->flags |= HOTSPOTFLAG_HIGHLIGHTED;
}
}
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