[Refactor] #38997 place_inner_perm_grid() を削除し、place_grid() に統合 / Removed place_inner...

diff --git a/src/grid.c b/src/grid.c
index 470db29..696cf62 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -1208,15 +1208,6 @@ bool player_can_enter(player_type *creature_ptr, FEAT_IDX feature, BIT_FLAGS16 m
 }
 
 
-void place_inner_perm_grid(grid_type *g_ptr)
-{
-       g_ptr->feat = feat_permanent;
-       g_ptr->info &= ~(CAVE_MASK);
-       g_ptr->info |= CAVE_INNER;
-       if (g_ptr->m_idx) delete_monster_idx(g_ptr->m_idx);
-}
-
-
 void place_outer_grid(grid_type *g_ptr)
 {
        g_ptr->feat = feat_wall_outer;
@@ -1268,12 +1259,18 @@ void place_grid(grid_type *g_ptr, place_grid_type pg_type)
                g_ptr->info |= CAVE_INNER;
                break;
        }
-       case outer:
+       case inner_perm:
        {
                g_ptr->feat = feat_permanent;
                g_ptr->info |= CAVE_INNER;
                break;
        }
+       case outer:
+       {
+               g_ptr->feat = feat_wall_outer;
+               g_ptr->info |= CAVE_OUTER;
+               break;
+       }
        case outer_noperm:
        {
                feature_type *f_ptr = &f_info[feat_wall_outer];

diff --git a/src/grid.h b/src/grid.h
index e3b9f66..5d9f767 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -311,12 +311,12 @@ typedef enum place_grid_type
        floor,
        extra,
        inner,
+       inner_perm,
        outer,
        outer_noperm,
        solid_perm
 } place_grid_type;
 
-extern void place_inner_perm_grid(grid_type *g_ptr);
 extern void place_outer_grid(grid_type *g_ptr);
 extern void place_outer_noperm_grid(grid_type *g_ptr);
 extern void place_solid_perm_grid(grid_type *g_ptr);

diff --git a/src/rooms-special.c b/src/rooms-special.c
index 9f4b0dd..4f18f11 100644 (file)
--- a/src/rooms-special.c
+++ b/src/rooms-special.c
@@ -107,7 +107,7 @@ bool build_type15(player_type *player_ptr)
                        y = yval + 2 * ddy_ddd[dir1];
                        x = xval + 2 * ddx_ddd[dir1];
                        g_ptr = &floor_ptr->grid_array[y][x];
-                       place_inner_perm_grid(g_ptr);
+                       place_grid(g_ptr, inner_perm);
                        g_ptr->feat = feat_permanent_glass_wall;
                        floor_ptr->grid_array[yval + ddy_ddd[dir1]][xval + ddx_ddd[dir1]].info |= (CAVE_ICKY);
                }

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index ac45587..967490c 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -393,12 +393,12 @@ static void build_vault(player_type *player_ptr, POSITION yval, POSITION xval, P
 
                                /* Permanent wall (inner) */
                        case 'X':
-                               place_inner_perm_grid(g_ptr);
+                               place_grid(g_ptr, inner_perm);
                                break;
 
                                /* Permanent glass wall (inner) */
                        case 'Y':
-                               place_inner_perm_grid(g_ptr);
+                               place_grid(g_ptr, inner_perm);
                                g_ptr->feat = feat_permanent_glass_wall;
                                break;
 
@@ -1094,7 +1094,7 @@ static void build_mini_c_vault(player_type *player_ptr, POSITION x0, POSITION y0
                        g_ptr->info |= (CAVE_ROOM | CAVE_ICKY);
 
                        /* Permanent walls */
-                       place_inner_perm_grid(g_ptr);
+                       place_grid(g_ptr, inner_perm);
                }
        }