[Refactor] #37353 feat_*と命名を一致させるため fill_type を feat_wall_type に改名。 / Rename fill_typ...

diff --git a/src/cave.c b/src/cave.c
index ba2162a..a73efc4 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -4600,7 +4600,7 @@ FEAT_IDX conv_dungeon_feat(FEAT_IDX newfeat)
                case CONVERT_TYPE_FLOOR:
                        return feat_ground_type[randint0(100)];
                case CONVERT_TYPE_WALL:
-                       return fill_type[randint0(100)];
+                       return feat_wall_type[randint0(100)];
                case CONVERT_TYPE_INNER:
                        return feat_wall_inner;
                case CONVERT_TYPE_OUTER:

diff --git a/src/externs.h b/src/externs.h
index dbc539b..97ed70f 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -445,7 +445,7 @@ extern DEPTH *max_dlv;
 extern FEAT_IDX feat_wall_outer;
 extern FEAT_IDX feat_wall_inner;
 extern FEAT_IDX feat_wall_solid;
-extern FEAT_IDX feat_ground_type[100], fill_type[100];
+extern FEAT_IDX feat_ground_type[100], feat_wall_type[100];
 extern bool now_damaged;
 extern COMMAND_CODE now_message;
 extern bool use_menu;

diff --git a/src/grid.c b/src/grid.c
index f6d09cd..a6082a9 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -175,7 +175,7 @@ void place_random_door(POSITION y, POSITION x, bool room)
                if (type != DOOR_CURTAIN)
                {
                        /* Hide. If on the edge of room, use outer wall. */
-                       c_ptr->mimic = room ? feat_wall_outer : fill_type[randint0(100)];
+                       c_ptr->mimic = room ? feat_wall_outer : feat_wall_type[randint0(100)];
 
                        /* Floor type terrain cannot hide a door */
                        if (feat_supports_los(c_ptr->mimic) && !feat_supports_los(c_ptr->feat))

diff --git a/src/grid.h b/src/grid.h
index 16f6702..01d6efe 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -81,7 +81,7 @@
 
 #define place_extra_bold(Y, X) \
 { \
-       set_cave_feat(Y,X,fill_type[randint0(100)]); \
+       set_cave_feat(Y,X,feat_wall_type[randint0(100)]); \
        cave[Y][X].info &= ~(CAVE_MASK); \
        add_cave_info(Y,X,CAVE_EXTRA); \
        delete_monster(Y, X); \
@@ -89,7 +89,7 @@
 
 #define place_extra_grid(C) \
 { \
-       (C)->feat = fill_type[randint0(100)]; \
+       (C)->feat = feat_wall_type[randint0(100)]; \
        (C)->info &= ~(CAVE_MASK); \
        (C)->info |= CAVE_EXTRA; \
        if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
@@ -114,7 +114,7 @@
 #define place_extra_noperm_bold(Y, X) \
 { \
        feature_type *_f_ptr; \
-       set_cave_feat(Y,X,fill_type[randint0(100)]); \
+       set_cave_feat(Y,X,feat_wall_type[randint0(100)]); \
        _f_ptr = &f_info[cave[Y][X].feat]; \
        if (permanent_wall(_f_ptr)) cave[Y][X].feat = feat_state(cave[Y][X].feat, FF_UNPERM); \
        cave[Y][X].info &= ~(CAVE_MASK); \

diff --git a/src/variable.c b/src/variable.c
index d471056..420d164 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -956,7 +956,7 @@ DEPTH *max_dlv;
 FEAT_IDX feat_wall_outer;
 FEAT_IDX feat_wall_inner;
 FEAT_IDX feat_wall_solid;
-FEAT_IDX feat_ground_type[100], fill_type[100];
+FEAT_IDX feat_ground_type[100], feat_wall_type[100];
 
 bool now_damaged;
 COMMAND_CODE now_message;

diff --git a/src/wild.c b/src/wild.c
index 08dacb9..d1d2957 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -57,7 +57,7 @@ void set_floor_and_wall(DUNGEON_IDX type)
        d_ptr = &d_info[type];
 
        set_floor_and_wall_aux(feat_ground_type, d_ptr->floor);
-       set_floor_and_wall_aux(fill_type, d_ptr->fill);
+       set_floor_and_wall_aux(feat_wall_type, d_ptr->fill);
 
        feat_wall_outer = d_ptr->outer_wall;
        feat_wall_inner = d_ptr->inner_wall;