Changeset 638

Timestamp:

12/23/07 19:18:51 (9 months ago)

Author:

takkaria

Message:

Another try and sorting out the issue behind #263:

• Move map_area() to the same place as the detection spells in spells2.c.
  
• Try a different approach at detection: make all of magic mapping & detect trap/door/stair/monster/item/treasure use the same width&height rectangular area around the player.
  

Files:

• trunk/src/cave.c (modified) (1 diff)
• trunk/src/spells2.c (modified) (15 diffs)

trunk/src/cave.c

@@ -3154 +3154 @@
-
-/*
- * Map a radius 30 area around the player.
- *
- * We must never attempt to map the outer dungeon walls, or we
- * might induce illegal cave grid references.
- */
-void map_area(void)
-{
-        int i, x, y;
-
-        /* Scan the dungeon */
-        for (y = 1; y < DUNGEON_HGT - 1; y++)
-        {
-                for (x = 1; x < DUNGEON_WID - 1; x++)
-                {
-                        /* All non-walls are "checked" */
-                        if (cave_feat[y][x] < FEAT_SECRET)
-                        {
-                                if (!in_bounds_fully(y, x)) continue;
-
-                                /* Restrict to being in a certain radius */
-                                if (distance(p_ptr->py, p_ptr->px, y, x) > 30) continue;
-
-                                /* Memorize normal features */
-                                if (cave_feat[y][x] > FEAT_INVIS)
-                                {
-                                        /* Memorize the object */
-                                        cave_info[y][x] |= (CAVE_MARK);
-                                        lite_spot(y, x);
-                                }
-
-                                /* Memorize known walls */
-                                for (i = 0; i < 8; i++)
-                                {
-                                        int yy = y + ddy_ddd[i];
-                                        int xx = x + ddx_ddd[i];
-
-                                        /* Memorize walls (etc) */
-                                        if (cave_feat[yy][xx] >= FEAT_SECRET)
-                                        {
-                                                /* Memorize the walls */
-                                                cave_info[yy][xx] |= (CAVE_MARK);
-                                                lite_spot(yy, xx);
-                                        }
-                                }
-                        }
-                }
-        }
-}
-
-
-
-/*
- * Light up the dungeon using "claravoyance"
- *

trunk/src/spells2.c

@@ -943 +943 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- *
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-bool detect_traps(void)
-{
-        int y, x;
+        int x1, x2, y1, y2;
-
-        bool detect = FALSE;
-
+        /* Pick an area to map */
+        y1 = p_ptr->py - DETECT_DIST_Y;
+        y2 = p_ptr->py + DETECT_DIST_Y;
+        x1 = p_ptr->px - DETECT_DIST_X;
+        x2 = p_ptr->px + DETECT_DIST_X;
+
+        if (y1 < 0) y1 = 0;
+        if (x1 < 0) x1 = 0;
+
-
-        /* Scan the dungeon */
-1; y < DUNGEON_HGT - 1
-
-1; x < DUNGEON_WID - 1
+y1; y < y2
+
+x1; x < x2
-                {
-                        if (!in_bounds_fully(y, x)) continue;
-
-                        /* Restrict to being in a certain radius */
-                        if (distance(p_ptr->py, p_ptr->px, y, x) > DET_RADIUS) continue;
-
-                        /* Detect invisible traps */
@@ -1012 +1080 @@
-
-/*
-all doors and stairs
+doors and stairs around the player
- */
-bool detect_doorstairs(void)
-{
-        int y, x;
+        int x1, x2, y1, y2;
+
-        bool doors = FALSE, stairs = FALSE;
-
-
+        /* Pick an area to map */
+        y1 = p_ptr->py - DETECT_DIST_Y;
+        y2 = p_ptr->py + DETECT_DIST_Y;
+        x1 = p_ptr->px - DETECT_DIST_X;
+        x2 = p_ptr->px + DETECT_DIST_X;
+
+        if (y1 < 0) y1 = 0;
+        if (x1 < 0) x1 = 0;
+
+
-        /* Scan the dungeon */
-1; y < DUNGEON_HGT - 1
-
-1; x < DUNGEON_WID - 1
+y1; y < y2
+
+x1; x < x2
-                {
-                        if (!in_bounds_fully(y, x)) continue;
@@ -1075 +1155 @@
-
-/*
-ny treasure inside radius 22
+ll treasure around the player
- */
-bool detect_treasure(void)
@@ -1081 +1161 @@
-        int i;
-        int y, x;
+        int x1, x2, y1, y2;
-
-        bool gold_buried = FALSE;
@@ -1087 +1168 @@
-
-
+        /* Pick an area to map */
+        y1 = p_ptr->py - DETECT_DIST_Y;
+        y2 = p_ptr->py + DETECT_DIST_Y;
+        x1 = p_ptr->px - DETECT_DIST_X;
+        x2 = p_ptr->px + DETECT_DIST_X;
+
+        if (y1 < 0) y1 = 0;
+        if (x1 < 0) x1 = 0;
+
+
-        /* Scan the dungeon */
-1; y < DUNGEON_HGT - 1
-
-1; x < DUNGEON_WID - 1
+y1; y < y2
+
+x1; x < x2
-                {
-                        if (!in_bounds_fully(y, x)) continue;
@@ -1133 +1224 @@
-                x = o_ptr->ix;
-
+                /* Only detect nearby objects */
+                if (x < x1 || y < y1 || x > x2 || y > y2) continue;
+
-                /* Hack -- memorize it */
-                o_ptr->marked = TRUE;
@@ -1158 +1252 @@
-
-/*
-all "magic" objects inside radius 22
+"magic" objects around the player
- *
- * This will light up all spaces with "magic" items, including artifacts,
@@ -1169 +1263 @@
-{
-        int i, y, x, tv;
+        int x1, x2, y1, y2;
-
-        bool detect = FALSE;
+
+
+        /* Pick an area to map */
+        y1 = p_ptr->py - DETECT_DIST_Y;
+        y2 = p_ptr->py + DETECT_DIST_Y;
+        x1 = p_ptr->px - DETECT_DIST_X;
+        x2 = p_ptr->px + DETECT_DIST_X;
+
+        if (y1 < 0) y1 = 0;
+        if (x1 < 0) x1 = 0;
-
-
@@ -1188 +1293 @@
-                x = o_ptr->ix;
-
+
-                /* Only detect nearby objects */
-distance(p_ptr->py, p_ptr->px, y, x) > DET_RADIUS
+x < x1 || y < y1 || x > x2 || y > y2
-
-                /* Examine the tval */
@@ -1222 +1328 @@
-
-/*
-all "normal" monsters inside radius 22
+"normal" monsters around the player
- */
-bool detect_monsters_normal(void)
-{
-        int i, y, x;
+        int x1, x2, y1, y2;
-
-        bool flag = FALSE;
+
+
+        /* Pick an area to map */
+        y1 = p_ptr->py - DETECT_DIST_Y;
+        y2 = p_ptr->py + DETECT_DIST_Y;
+        x1 = p_ptr->px - DETECT_DIST_X;
+        x2 = p_ptr->px + DETECT_DIST_X;
+
+        if (y1 < 0) y1 = 0;
+        if (x1 < 0) x1 = 0;
+
-
-
@@ -1245 +1363 @@
-
-                /* Only detect nearby monsters */
-distance(p_ptr->py, p_ptr->px, y, x) > DET_RADIUS
+x < x1 || y < y1 || x > x2 || y > y2
-
-                /* Detect all non-invisible monsters */
@@ -1273 +1391 @@
-
-/*
-all "invisible" monsters inside radius 22
+"invisible" monsters around the player
- */
-bool detect_monsters_invis(void)
-{
-        int i, y, x;
+        int x1, x2, y1, y2;
-
-        bool flag = FALSE;
+
+        /* Pick an area to map */
+        y1 = p_ptr->py - DETECT_DIST_Y;
+        y2 = p_ptr->py + DETECT_DIST_Y;
+        x1 = p_ptr->px - DETECT_DIST_X;
+        x2 = p_ptr->px + DETECT_DIST_X;
+
+        if (y1 < 0) y1 = 0;
+        if (x1 < 0) x1 = 0;
-
-
@@ -1296 +1424 @@
-                x = m_ptr->fx;
-
-monster
-distance(p_ptr->py, p_ptr->px, y, x) > DET_RADIUS
+object
+x < x1 || y < y1 || x > x2 || y > y2
-
-                /* Detect invisible monsters */
@@ -1335 +1463 @@
-
-/*
-all "evil" monsters inside radius 22
+"evil" monsters around the player
- */
-bool detect_monsters_evil(void)
-{
-        int i, y, x;
+        int x1, x2, y1, y2;
-
-        bool flag = FALSE;
+
+        /* Pick an area to map */
+        y1 = p_ptr->py - DETECT_DIST_Y;
+        y2 = p_ptr->py + DETECT_DIST_Y;
+        x1 = p_ptr->px - DETECT_DIST_X;
+        x2 = p_ptr->px + DETECT_DIST_X;
+
+        if (y1 < 0) y1 = 0;
+        if (x1 < 0) x1 = 0;
-
-
@@ -1358 +1496 @@
-                x = m_ptr->fx;
-
-monster
-distance(p_ptr->py, p_ptr->px, y, x) > DET_RADIUS
+object
+x < x1 || y < y1 || x > x2 || y > y2
-
-                /* Detect evil monsters */