diff options
| author | Paul Gilbert | 2007-01-31 02:26:16 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2007-01-31 02:26:16 +0000 |
| commit | 9d474d62582c152c0d9b47e86b1880dca3b0da51 (patch) | |
| tree | 32717904cc5975f441232bcc6e8d83e8add67a5d /engines | |
| parent | ee606dc1435e8e2012bd73597dc08bdef32c1f7b (diff) | |
| download | scummvm-rg350-9d474d62582c152c0d9b47e86b1880dca3b0da51.tar.gz scummvm-rg350-9d474d62582c152c0d9b47e86b1880dca3b0da51.tar.bz2 scummvm-rg350-9d474d62582c152c0d9b47e86b1880dca3b0da51.zip | |
Added check to skip drawing hotspots in layer 1 if their skip flag is set
svn-id: r25298
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lure/room.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp index a97ef174dc..7d76165050 100644 --- a/engines/lure/room.cpp +++ b/engines/lure/room.cpp @@ -384,8 +384,8 @@ void Room::update() { 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 @@ void Room::update() { // 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 @@ void Room::update() { } else if (_roomData->paths.isOccupied(xctr, yctr)) { s.fillRect(Rect(xctr * 8, yctr * 8 + 8, xctr * 8 + 7, yctr * 8 + 15), 255); } -*/ } } |