Ticket #222: cave.diff

trunk-r440/src/cave.c

@@ -469 +469 @@
-                                        break;
-                        }
-                }
+                /* Use a brightly lit tile */
+                switch (use_graphics)
+                {
+                        case GRAPHICS_NONE:
+                        case GRAPHICS_PSEUDO:
+                                if (*a == TERM_GREEN) *a = TERM_L_GREEN;
+                                break;
+                        case GRAPHICS_ADAM_BOLT:
+                                break;
+                        case GRAPHICS_DAVID_GERVAIS:
+                                break;
+                }
-        }
-
-        /* Handle "dark" grids and "blindness" */
@@ -564 +576 @@
-        }
-}
-
+/*
+ * 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;
+
+        /* Looks better without the diagonals */
+#if 0
+        if (in_bounds(y + 1, x + 1) && (!cave_info2[y + 1][x + 1] & CAVE2_DTRAP)) return TRUE;
+        if (in_bounds(y - 1, x + 1) && (!cave_info2[y - 1][x + 1] & CAVE2_DTRAP)) return TRUE;
+        if (in_bounds(y - 1, x - 1) && (!cave_info2[y - 1][x - 1] & CAVE2_DTRAP)) return TRUE;
+        if (in_bounds(y + 1, x - 1) && (!cave_info2[y + 1][x - 1] & CAVE2_DTRAP)) return TRUE;
+#endif
+        return FALSE;
+}
-
-/*
- * Extract the attr/char to display at the given (legal) map location
@@ -735 +771 @@
-        char c;
-
-        byte feat;
-
+, info2
-
-        feature_type *f_ptr;
-        object_type *o_ptr;
@@ -754 +790 @@
-
-        /* Cave flags */
-        info = cave_info[y][x];
+        info2 = cave_info2[y][x];
-
-        /* Hack -- rare random hallucination on non-outer walls */
-        if (image && (!rand_int(256)) && (feat < FEAT_PERM_SOLID))
@@ -780 +817 @@
-                        /* Normal char */
-                        c = f_ptr->x_char;
-
+                        if (dtrap_edge(y, x))
+                        {
+                                a = TERM_GREEN;
+                                c = '.';
+                        }
+
-                        /* Special lighting effects */
-                        if (view_special_lite) special_lighting_floor(&a, &c, info);
+
-                }
-
-                /* Unknown */
@@ -795 +839 @@
-
-                        /* Normal char */
-                        c = f_ptr->x_char;
+
+                        /* Check the dtrap edge */
+                        if (dtrap_edge(y, x))
+                        {
+                                a = TERM_GREEN;
+                                c = '.';
+                        }
+
-                }
-        }
-
@@ -818 +870 @@
-
-                        /* Special lighting effects (walls only) */
-                        if (view_granite_lite) special_lighting_wall(&a, &c, feat, info);
+                        
-                }
-
-                /* Unknown */
@@ -831 +884 @@
-
-                        /* Normal char */
-                        c = f_ptr->x_char;
+                        
+                        /* Check the dtrap edge */
+                        if (dtrap_edge(y, x))
+                        {
+                                a = TERM_GREEN;
+                                c = '.';
+                        }
-                }
-        }
-