From: Hourier <hourier@users.sourceforge.jp>
Date: Sat, 18 Jan 2020 08:20:24 +0000 (+0900)
Subject: [Refactor] #38997 place_outer_perm_grid() を削除し、place_grid() に統合 / Removed place_outer... 
X-Git-Tag: vmacos3.0.0-alpha52~1903^2~29
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9e90b13627a2e830f5a1c73a9c0228b8f173328c;p=hengbandforosx%2Fhengbandosx.git

[Refactor] #38997 place_outer_perm_grid() を削除し、place_grid() に統合 / Removed place_outer_perm_grid() and unified into place_grid()
---

diff --git a/src/floor-generate.c b/src/floor-generate.c
index b25a51ee0..a99fcb840 100644
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -1869,7 +1869,7 @@ static bool set_tunnel(floor_type *floor_ptr, POSITION *x, POSITION *y, bool aff
 		if (i == 0)
 		{
 			/* Failed for some reason: hack - ignore the solidness */
-			place_outer_grid(g_ptr);
+			place_grid(g_ptr, outer);
 			dx = 0;
 			dy = 0;
 		}
diff --git a/src/grid.c b/src/grid.c
index 696cf62f9..d0cd158b7 100644
--- 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_outer_grid(grid_type *g_ptr)
-{
-	g_ptr->feat = feat_wall_outer;
-	g_ptr->info &= ~(CAVE_MASK);
-	g_ptr->info |= CAVE_OUTER;
-	if (g_ptr->m_idx) delete_monster_idx(g_ptr->m_idx);
-}
-
-
 void place_outer_noperm_grid(grid_type *g_ptr)
 {
 	feature_type *_f_ptr = &f_info[feat_wall_outer];
diff --git a/src/grid.h b/src/grid.h
index 5d9f76704..33708590c 100644
--- a/src/grid.h
+++ b/src/grid.h
@@ -317,7 +317,6 @@ typedef enum place_grid_type
 	solid_perm
 } place_grid_type;
 
-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);
 extern void place_grid(grid_type *g_ptr, place_grid_type pg_type);
diff --git a/src/rooms-normal.c b/src/rooms-normal.c
index 8273a5d1e..4aaaf4cd2 100644
--- a/src/rooms-normal.c
+++ b/src/rooms-normal.c
@@ -77,16 +77,16 @@ bool build_type1(player_type *player_ptr)
 	for (y = y1 - 1; y <= y2 + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1 - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y][x2 + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 	for (x = x1 - 1; x <= x2 + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1 - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y2 + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 
 
@@ -264,32 +264,32 @@ bool build_type2(floor_type *floor_ptr)
 	for (y = y1a - 1; y <= y2a + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1a - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y][x2a + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 	for (x = x1a - 1; x <= x2a + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1a - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y2a + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 
 	/* Place the walls around room "b" */
 	for (y = y1b - 1; y <= y2b + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1b - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y][x2b + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 	for (x = x1b - 1; x <= x2b + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1b - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y2b + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 
 
@@ -400,32 +400,32 @@ bool build_type3(player_type *player_ptr)
 	for (y = y1a - 1; y <= y2a + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1a - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y][x2a + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 	for (x = x1a - 1; x <= x2a + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1a - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y2a + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 
 	/* Place the walls around room "b" */
 	for (y = y1b - 1; y <= y2b + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1b - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y][x2b + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 	for (x = x1b - 1; x <= x2b + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1b - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y2b + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 
 
@@ -625,16 +625,16 @@ bool build_type4(player_type *player_ptr)
 	for (y = y1 - 1; y <= y2 + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1 - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y][x2 + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 	for (x = x1 - 1; x <= x2 + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1 - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y2 + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 
 
diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c
index 386b76c95..6f4d43bae 100644
--- a/src/rooms-pitnest.c
+++ b/src/rooms-pitnest.c
@@ -364,16 +364,16 @@ bool build_type5(player_type *player_ptr)
 	for (y = y1 - 1; y <= y2 + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1 - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y][x2 + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 	for (x = x1 - 1; x <= x2 + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1 - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y2 + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 
 
@@ -573,16 +573,16 @@ bool build_type6(player_type *player_ptr)
 	for (y = y1 - 1; y <= y2 + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1 - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y][x2 + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 	for (x = x1 - 1; x <= x2 + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1 - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y2 + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 
 	/* Advance to the center room */
@@ -917,16 +917,16 @@ bool build_type13(player_type *player_ptr)
 	for (y = y1 - 1; y <= y2 + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1 - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y][x2 + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 	for (x = x1 - 1; x <= x2 + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1 - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y2 + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 
 	/* Random corridor */
diff --git a/src/rooms-special.c b/src/rooms-special.c
index 4f18f11b9..3185b83f6 100644
--- a/src/rooms-special.c
+++ b/src/rooms-special.c
@@ -59,20 +59,20 @@ bool build_type15(player_type *player_ptr)
 	for (y = y1 - 1; y <= y2 + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1 - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr->feat = feat_glass_wall;
 		g_ptr = &floor_ptr->grid_array[y][x2 + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr->feat = feat_glass_wall;
 	}
 
 	for (x = x1 - 1; x <= x2 + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1 - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr->feat = feat_glass_wall;
 		g_ptr = &floor_ptr->grid_array[y2 + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr->feat = feat_glass_wall;
 	}
 
diff --git a/src/rooms-trap.c b/src/rooms-trap.c
index 680afc4c1..a5ef78755 100644
--- a/src/rooms-trap.c
+++ b/src/rooms-trap.c
@@ -63,16 +63,16 @@ bool build_type14(floor_type *floor_ptr)
 	for (y = y1 - 1; y <= y2 + 1; y++)
 	{
 		g_ptr = &floor_ptr->grid_array[y][x1 - 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y][x2 + 1];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 	for (x = x1 - 1; x <= x2 + 1; x++)
 	{
 		g_ptr = &floor_ptr->grid_array[y1 - 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 		g_ptr = &floor_ptr->grid_array[y2 + 1][x];
-		place_outer_grid(g_ptr);
+		place_grid(g_ptr, outer);
 	}
 
 	if (floor_ptr->dun_level < 30 + randint1(30))
diff --git a/src/rooms.c b/src/rooms.c
index 62dce23bc..c2c5c2565 100644
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -1692,7 +1692,7 @@ void build_maze_vault(player_type *player_ptr, POSITION x0, POSITION y0, POSITIO
 			if (is_vault) g_ptr->info |= CAVE_ICKY;
 			if ((x == x1 - 1) || (x == x2 + 1) || (y == y1 - 1) || (y == y2 + 1))
 			{
-				place_outer_grid(g_ptr);
+				place_grid(g_ptr, outer);
 			}
 			else if (!is_vault)
 			{