[Scummvm-cvs-logs] SF.net SVN: scummvm: [25298] scummvm/trunk/engines/lure/room.cpp

[dreammaster at users.sourceforge.net]

Revision: 25298
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25298&view=rev
Author:   dreammaster
Date:     2007-01-30 18:26:16 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
Added check to skip drawing hotspots in layer 1 if their skip flag is set

Modified Paths:
--------------
    scummvm/trunk/engines/lure/room.cpp

Modified: scummvm/trunk/engines/lure/room.cpp
===================================================================
--- scummvm/trunk/engines/lure/room.cpp	2007-01-31 02:24:55 UTC (rev 25297)
+++ scummvm/trunk/engines/lure/room.cpp	2007-01-31 02:26:16 UTC (rev 25298)
@@ -384,8 +384,8 @@
 	List<Hotspot *>::iterator iTemp;
 	for (i = hotspots.begin(); i != hotspots.end(); ++i) {
 		Hotspot *h = i.operator*();
-		if ((h->roomNumber() != _roomNumber) || !h->isActiveAnimation() 
-				|| (h->layer() != 1)) 
+		if ((h->layer() != 1) || (h->roomNumber() != _roomNumber) || 
+			h->skipFlag() || !h->isActiveAnimation())
 			continue;
 		int16 endY = h->y() + h->heightCopy();
 
@@ -462,9 +462,10 @@
 		// Temporary display of pathfinding data
 		for (int yctr = 0; yctr < ROOM_PATHS_HEIGHT; ++yctr) {
 			for (int xctr = 0; xctr < ROOM_PATHS_WIDTH; ++xctr) {
+/*
 				if (_roomData->paths.isOccupied(xctr, yctr)) 
 					s.fillRect(Rect(xctr * 8, yctr * 8 + 8, xctr * 8 + 7, yctr * 8 + 15), 255);
-/*
+*/
 				uint16 v = tempLayer[(yctr + 1) * DECODED_PATHS_WIDTH + xctr + 1];
 				if ((v != 0) && (v < 100)) {
 					sprintf(buffer, "%d", v % 10);
@@ -473,7 +474,6 @@
 				} else if (_roomData->paths.isOccupied(xctr, yctr)) {
 					s.fillRect(Rect(xctr * 8, yctr * 8 + 8, xctr * 8 + 7, yctr * 8 + 15), 255);
 				}
-*/
 			}
 		}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.