Changeset 808

Timestamp:

03/19/08 18:42:43 (5 months ago)

Author:

GabeCunningham

Message:

Fix #222: Display trap detection borders as a colored dot. Thanks to Big Al for the original patch.

Files:

• trunk/src/cave.c (modified) (9 diffs)
• trunk/src/spells2.c (modified) (2 diffs)
• trunk/src/types.h (modified) (1 diff)

trunk/src/cave.c

@@ -501 +501 @@
-                                        /* Use "gray" */
-                                        if (*a == TERM_WHITE) *a = TERM_SLATE;
+                                        else if (*a == TERM_L_GREEN) *a = TERM_GREEN;
-                                        break;
-                                case GRAPHICS_ADAM_BOLT:
@@ -577 +578 @@
-
-
+/* 
+ * Checks if a square is at the (inner) edge of a trap detect area 
+ */ 
+static bool dtrap_edge(int y, int x) 
+{ 
+        /* Check if the square is a dtrap in the first place */ 
+        if (!cave_info2[y][x] & CAVE2_DTRAP) return FALSE; 
+
+        /* Check for non-dtrap adjacent grids */ 
+        if (in_bounds(y + 1, x    ) && (!cave_info2[y + 1][x    ] & CAVE2_DTRAP)) return TRUE; 
+        if (in_bounds(y    , x + 1) && (!cave_info2[y    ][x + 1] & CAVE2_DTRAP)) return TRUE; 
+        if (in_bounds(y - 1, x    ) && (!cave_info2[y - 1][x    ] & CAVE2_DTRAP)) return TRUE; 
+        if (in_bounds(y    , x - 1) && (!cave_info2[y    ][x - 1] & CAVE2_DTRAP)) return TRUE; 
+
+        return FALSE; 
+} 
+
+
-/*
- * This function takes a pointer to a grid info struct describing the 
@@ -623 +642 @@
-        c = f_ptr->x_char;
-
+        /* Check for trap detection boundaries */
+        if (g->trapborder && g->f_idx == FEAT_FLOOR) a = TERM_L_GREEN;
+
-        /* Special lighting effects */
-        if (g->f_idx <= FEAT_INVIS && view_special_lite)
@@ -630 +652 @@
-        if (g->f_idx > FEAT_INVIS && view_granite_lite) 
-                special_wall_display(&a, &c, g->in_view, g->f_idx);
-
+
-        /* Save the terrain info for the transparency effects */
-        (*tap) = a;
@@ -809 +831 @@
-
-
+
+
-/*
- * This function takes a grid location (x, y) and extracts information the
@@ -859 +883 @@
-{
-        object_type *o_ptr;
-
+, info2
-
-        assert(x < DUNGEON_WID);
@@ -865 +889 @@
-
-        info = cave_info[y][x];
+        info2 = cave_info2[y][x];
-        
-        /* Default "clear" values, others will be set later where appropriate. */
@@ -877 +902 @@
-        g->m_idx = (g->is_player) ? 0 : cave_m_idx[y][x];
-        g->hallucinate = p_ptr->timed[TMD_IMAGE] ? TRUE : FALSE;
+        g->trapborder = (dtrap_edge(y, x)) ? TRUE : FALSE;
-
-        /* If the grid is memorised or can currently be seen */
@@ -3887 +3913 @@
-
-
-

trunk/src/spells2.c

@@ -1045 +1045 @@
-                                cave_info[y][x] |= (CAVE_MARK);
-
-                                /* Redraw */
-                                lite_spot(y, x);
-
-                                /* We found something to detect */
-                                detect = TRUE;
@@ -1056 +1053 @@
-                }
-        }
+
+        /* Rescan the map for the new dtrap edge */ 
+        for (y = y1-1; y < y2+1; y++) 
+        { 
+                for (x = x1-1; x < x2+1; x++) 
+                { 
+                        if (!in_bounds_fully(y, x)) continue; 
+                 
+                        /* Redraw */ 
+                        lite_spot(y, x); 
+                } 
+        } 
+                 
-
-        /* Describe */

trunk/src/types.h

@@ -1099 +1099 @@
-        bool is_player;
-        bool hallucinate;
+        bool trapborder;
-} grid_data;
-