featが床であるかどうかの判定(!(feat & 0x20))を剥き出しの演算ではなく

マクロfeat_floor()としてまとめた.

diff --git a/src/cmd1.c b/src/cmd1.c
index 475b50a..dc79cc8 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -4896,7 +4896,7 @@ static bool run_test(void)
                }
 
                /* Analyze unknown grids and floors considering mimic */
-               if (inv || (!(feat & 0x20)))
+               if (inv || feat_floor(feat))
                {
                        /* Looking for open area */
                        if (find_openarea)

diff --git a/src/defines.h b/src/defines.h
index 2780c32..10db0ca 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -4037,6 +4037,13 @@
 
 
 /*
+ * Determine if a "feature" is a "floor"
+ */
+#define feat_floor(F) \
+       (!((F) & 0x20))
+
+
+/*
  * Determine if a "legal" grid is a "floor" grid
  *
  * Line 1 -- forbid doors, rubble, seams, walls
@@ -4049,7 +4056,7 @@
  * -KMW-
  */
 #define cave_floor_bold(Y,X) \
-       (!(cave[Y][X].feat & 0x20))
+       (feat_floor(cave[(Y)][(X)].feat))
 
 
 /*
@@ -4151,7 +4158,7 @@
  * Grid based version of "cave_floor_bold()"
  */
 #define cave_floor_grid(C) \
-    (!((C)->feat & 0x20))
+       (feat_floor((C)->feat))
 
 
 /*
@@ -4247,14 +4254,12 @@
  * Determine if a "boundary" grid is "floor mimic"
  */
 #define boundary_floor_bold(Y,X) \
-    ((cave[(Y)][(X)].feat == FEAT_PERM_SOLID) && \
-      cave[(Y)][(X)].mimic && \
-    !(cave[(Y)][(X)].mimic & 0x20))
+       ((cave[(Y)][(X)].feat == FEAT_PERM_SOLID) && \
+         cave[(Y)][(X)].mimic && feat_floor(cave[(Y)][(X)].mimic))
 
 #define boundary_floor_grid(C) \
-    (((C)->feat == FEAT_PERM_SOLID) && \
-      (C)->mimic && \
-    !((C)->mimic & 0x20))
+       (((C)->feat == FEAT_PERM_SOLID) && \
+         (C)->mimic && feat_floor((C)->mimic))
 
 #define update_playtime() \
 {\

diff --git a/src/grid.c b/src/grid.c
index 444351a..064cf95 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -148,7 +148,7 @@ void place_random_door(int y, int x, bool room)
                c_ptr->mimic = room ? feat_wall_outer : fill_type[randint0(100)];
 
                /* Floor type terrain cannot hide a door */
-               if (!(c_ptr->mimic & 0x20))
+               if (feat_floor(c_ptr->mimic))
                {
                        c_ptr->feat = c_ptr->mimic;
                        c_ptr->mimic = 0;

diff --git a/src/rooms.c b/src/rooms.c
index 08ff9d5..06d9a45 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -70,7 +70,7 @@ static void place_secret_door(int y, int x)
                c_ptr->mimic = feat_wall_inner;
 
                /* Floor type terrain cannot hide a door */
-               if (!(c_ptr->mimic & 0x20))
+               if (feat_floor(c_ptr->mimic))
                {
                        c_ptr->feat = c_ptr->mimic;
                        c_ptr->mimic = 0;