From: Deskull <deskull@users.sourceforge.jp>
Date: Sun, 16 Sep 2018 12:24:47 +0000 (+0900)
Subject: [Refactor] #37353　rooms, grid, generate間のドア処理整理。 / Refactor between door process... 
X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=4e611411038fb31ffd95b56f3b2457bd0d48a115

[Refactor] #37353　rooms, grid, generate間のドア処理整理。 / Refactor between door process of rooms, grid, and generate.
---

diff --git a/src/generate.c b/src/generate.c
index c7b4bb792..8805368aa 100644
--- a/src/generate.c
+++ b/src/generate.c
@@ -368,110 +368,7 @@ static void alloc_object(int set, int typ, int num)
 	}
 }
 
-/*!
- * @brief 隣接4マスに存在する通路の数を返す / Count the number of "corridor" grids adjacent to the given grid.
- * @param y1 基準となるマスのY座標
- * @param x1 基準となるマスのX座標
- * @return 通路の数
- * @note Assumes "in_bounds(y1, x1)"
- * @details
- * XXX XXX This routine currently only counts actual "empty floor"\n
- * grids which are not in rooms.  We might want to also count stairs,\n
- * open doors, closed doors, etc.
- */
-static int next_to_corr(int y1, int x1)
-{
-	int i, y, x, k = 0;
-
-	cave_type *c_ptr;
-
-	/* Scan adjacent grids */
-	for (i = 0; i < 4; i++)
-	{
-		/* Extract the location */
-		y = y1 + ddy_ddd[i];
-		x = x1 + ddx_ddd[i];
-
-		/* Access the grid */
-		c_ptr = &cave[y][x];
-
-		/* Skip non floors */
-		if (cave_have_flag_grid(c_ptr, FF_WALL)) continue;
-
-		/* Skip non "empty floor" grids */
-		if (!is_floor_grid(c_ptr))
-			continue;
-
-		/* Skip grids inside rooms */
-		if (c_ptr->info & (CAVE_ROOM)) continue;
-
-		/* Count these grids */
-		k++;
-	}
-
-	/* Return the number of corridors */
-	return (k);
-}
-
-
-/*!
- * @brief ドアを設置可能な地形かを返す / Determine if the given location is "between" two walls, and "next to" two corridor spaces.
- * @param y 判定を行いたいマスのY座標
- * @param x 判定を行いたいマスのX座標
- * @return ドアを設置可能ならばTRUEを返す
- * @note Assumes "in_bounds(y1, x1)"
- * @details
- * XXX XXX XXX\n
- * Assumes "in_bounds(y, x)"\n
- */
-static bool possible_doorway(int y, int x)
-{
-	/* Count the adjacent corridors */
-	if (next_to_corr(y, x) >= 2)
-	{
-		/* Check Vertical */
-		if (cave_have_flag_bold(y - 1, x, FF_WALL) &&
-		    cave_have_flag_bold(y + 1, x, FF_WALL))
-		{
-			return (TRUE);
-		}
-
-		/* Check Horizontal */
-		if (cave_have_flag_bold(y, x - 1, FF_WALL) &&
-		    cave_have_flag_bold(y, x + 1, FF_WALL))
-		{
-			return (TRUE);
-		}
-	}
-
-	/* No doorway */
-	return (FALSE);
-}
 
-/*!
- * @brief ドアの設置を試みる / Places door at y, x position if at least 2 walls found
- * @param y 設置を行いたいマスのY座標
- * @param x 設置を行いたいマスのX座標
- * @return なし
- */
-static void try_door(int y, int x)
-{
-	/* Paranoia */
-	if (!in_bounds(y, x)) return;
-
-	/* Ignore walls */
-	if (cave_have_flag_bold(y, x, FF_WALL)) return;
-
-	/* Ignore room grids */
-	if (cave[y][x].info & (CAVE_ROOM)) return;
-
-	/* Occasional door (if allowed) */
-	if ((randint0(100) < dun_tun_jct) && possible_doorway(y, x) && !(d_info[dungeon_type].flags1 & DF1_NO_DOORS))
-	{
-		/* Place a door */
-		place_random_door(y, x, FALSE);
-	}
-}
 
 
 /*!
diff --git a/src/grid.c b/src/grid.c
index 473633e83..9cd60cf4d 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -268,6 +268,232 @@ void place_closed_door(int y, int x, int type)
 }
 
 /*!
+* @brief 鍵のかかったドアを配置する
+* @param y 配置したいフロアのY座標
+* @param x 配置したいフロアのX座標
+* @return なし
+*/
+void place_locked_door(int y, int x)
+{
+	if (d_info[dungeon_type].flags1 & DF1_NO_DOORS)
+	{
+		place_floor_bold(y, x);
+	}
+	else
+	{
+		set_cave_feat(y, x, feat_locked_door_random((d_info[dungeon_type].flags1 & DF1_GLASS_DOOR) ? DOOR_GLASS_DOOR : DOOR_DOOR));
+		cave[y][x].info &= ~(CAVE_FLOOR);
+		delete_monster(y, x);
+	}
+}
+
+
+/*!
+* @brief 隠しドアを配置する
+* @param y 配置したいフロアのY座標
+* @param x 配置したいフロアのX座標
+* @param type DOOR_DEFAULT / DOOR_DOOR / DOOR_GLASS_DOOR / DOOR_CURTAIN のいずれか
+* @return なし
+*/
+void place_secret_door(int y, int x, int type)
+{
+	if (d_info[dungeon_type].flags1 & DF1_NO_DOORS)
+	{
+		place_floor_bold(y, x);
+	}
+	else
+	{
+		cave_type *c_ptr = &cave[y][x];
+
+		if (type == DOOR_DEFAULT)
+		{
+			type = ((d_info[dungeon_type].flags1 & DF1_CURTAIN) &&
+				one_in_((d_info[dungeon_type].flags1 & DF1_NO_CAVE) ? 16 : 256)) ? DOOR_CURTAIN :
+				((d_info[dungeon_type].flags1 & DF1_GLASS_DOOR) ? DOOR_GLASS_DOOR : DOOR_DOOR);
+		}
+
+		/* Create secret door */
+		place_closed_door(y, x, type);
+
+		if (type != DOOR_CURTAIN)
+		{
+			/* Hide by inner wall because this is used in rooms only */
+			c_ptr->mimic = feat_wall_inner;
+
+			/* Floor type terrain cannot hide a door */
+			if (feat_supports_los(c_ptr->mimic) && !feat_supports_los(c_ptr->feat))
+			{
+				if (have_flag(f_info[c_ptr->mimic].flags, FF_MOVE) || have_flag(f_info[c_ptr->mimic].flags, FF_CAN_FLY))
+				{
+					c_ptr->feat = one_in_(2) ? c_ptr->mimic : floor_type[randint0(100)];
+				}
+				c_ptr->mimic = 0;
+			}
+		}
+
+		c_ptr->info &= ~(CAVE_FLOOR);
+		delete_monster(y, x);
+	}
+}
+
+/*
+ * Routine used by the random vault creators to add a door to a location
+ * Note that range checking has to be done in the calling routine.
+ *
+ * The doors must be INSIDE the allocated region.
+ */
+void add_door(int x, int y)
+{
+	/* Need to have a wall in the center square */
+	if (!is_outer_bold(y, x)) return;
+
+	/* look at:
+	*  x#x
+	*  .#.
+	*  x#x
+	*
+	*  where x=don't care
+	*  .=floor, #=wall
+	*/
+
+	if (is_floor_bold(y - 1, x) && is_floor_bold(y + 1, x) &&
+		(is_outer_bold(y, x - 1) && is_outer_bold(y, x + 1)))
+	{
+		/* secret door */
+		place_secret_door(y, x, DOOR_DEFAULT);
+
+		/* set boundarys so don't get wide doors */
+		place_solid_bold(y, x - 1);
+		place_solid_bold(y, x + 1);
+	}
+
+
+	/* look at:
+	*  x#x
+	*  .#.
+	*  x#x
+	*
+	*  where x = don't care
+	*  .=floor, #=wall
+	*/
+	if (is_outer_bold(y - 1, x) && is_outer_bold(y + 1, x) &&
+		is_floor_bold(y, x - 1) && is_floor_bold(y, x + 1))
+	{
+		/* secret door */
+		place_secret_door(y, x, DOOR_DEFAULT);
+
+		/* set boundarys so don't get wide doors */
+		place_solid_bold(y - 1, x);
+		place_solid_bold(y + 1, x);
+	}
+}
+
+/*!
+* @brief 隣接4マスに存在する通路の数を返す / Count the number of "corridor" grids adjacent to the given grid.
+* @param y1 基準となるマスのY座標
+* @param x1 基準となるマスのX座標
+* @return 通路の数
+* @note Assumes "in_bounds(y1, x1)"
+* @details
+* XXX XXX This routine currently only counts actual "empty floor"\n
+* grids which are not in rooms.  We might want to also count stairs,\n
+* open doors, closed doors, etc.
+*/
+static int next_to_corr(int y1, int x1)
+{
+	int i, y, x, k = 0;
+
+	cave_type *c_ptr;
+
+	/* Scan adjacent grids */
+	for (i = 0; i < 4; i++)
+	{
+		/* Extract the location */
+		y = y1 + ddy_ddd[i];
+		x = x1 + ddx_ddd[i];
+
+		/* Access the grid */
+		c_ptr = &cave[y][x];
+
+		/* Skip non floors */
+		if (cave_have_flag_grid(c_ptr, FF_WALL)) continue;
+
+		/* Skip non "empty floor" grids */
+		if (!is_floor_grid(c_ptr))
+			continue;
+
+		/* Skip grids inside rooms */
+		if (c_ptr->info & (CAVE_ROOM)) continue;
+
+		/* Count these grids */
+		k++;
+	}
+
+	/* Return the number of corridors */
+	return (k);
+}
+
+/*!
+* @brief ドアを設置可能な地形かを返す / Determine if the given location is "between" two walls, and "next to" two corridor spaces.
+* @param y 判定を行いたいマスのY座標
+* @param x 判定を行いたいマスのX座標
+* @return ドアを設置可能ならばTRUEを返す
+* @note Assumes "in_bounds(y1, x1)"
+* @details
+* XXX XXX XXX\n
+* Assumes "in_bounds(y, x)"\n
+*/
+static bool possible_doorway(int y, int x)
+{
+	/* Count the adjacent corridors */
+	if (next_to_corr(y, x) >= 2)
+	{
+		/* Check Vertical */
+		if (cave_have_flag_bold(y - 1, x, FF_WALL) &&
+			cave_have_flag_bold(y + 1, x, FF_WALL))
+		{
+			return (TRUE);
+		}
+
+		/* Check Horizontal */
+		if (cave_have_flag_bold(y, x - 1, FF_WALL) &&
+			cave_have_flag_bold(y, x + 1, FF_WALL))
+		{
+			return (TRUE);
+		}
+	}
+
+	/* No doorway */
+	return (FALSE);
+}
+
+/*!
+* @brief ドアの設置を試みる / Places door at y, x position if at least 2 walls found
+* @param y 設置を行いたいマスのY座標
+* @param x 設置を行いたいマスのX座標
+* @return なし
+*/
+void try_door(int y, int x)
+{
+	/* Paranoia */
+	if (!in_bounds(y, x)) return;
+
+	/* Ignore walls */
+	if (cave_have_flag_bold(y, x, FF_WALL)) return;
+
+	/* Ignore room grids */
+	if (cave[y][x].info & (CAVE_ROOM)) return;
+
+	/* Occasional door (if allowed) */
+	if ((randint0(100) < dun_tun_jct) && possible_doorway(y, x) && !(d_info[dungeon_type].flags1 & DF1_NO_DOORS))
+	{
+		/* Place a door */
+		place_random_door(y, x, FALSE);
+	}
+}
+
+
+/*!
  * @brief 長方形の空洞を生成する / Make an empty square floor, for the middle of rooms
  * @param x1 長方形の左端X座標(-1)
  * @param x2 長方形の右端X座標(+1)
diff --git a/src/grid.h b/src/grid.h
index ae0e04318..c6b9781de 100644
--- a/src/grid.h
+++ b/src/grid.h
@@ -268,6 +268,10 @@ extern bool new_player_spot(void);
 extern void place_random_stairs(int y, int x);
 extern void place_random_door(int y, int x, bool room);
 extern void place_closed_door(int y, int x, int type);
+extern void add_door(int x, int y);
+extern void place_secret_door(int y, int x, int type);
+extern void place_locked_door(int y, int x);
+extern void try_door(int y, int x);
 extern void place_floor(int x1, int x2, int y1, int y2, bool light);
 extern void place_room(int x1, int x2, int y1, int y2, bool light);
 extern void vault_monsters(int y1, int x1, int num);
diff --git a/src/rooms.c b/src/rooms.c
index 023017f30..4a91eb76c 100644
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -111,74 +111,6 @@ static byte room_build_order[ROOM_T_MAX] = {
 };
 
 /*!
- * @brief 鍵のかかったドアを配置する
- * @param y 配置したいフロアのY座標
- * @param x 配置したいフロアのX座標
- * @return なし
- */
-void place_locked_door(int y, int x)
-{
-	if (d_info[dungeon_type].flags1 & DF1_NO_DOORS)
-	{
-		place_floor_bold(y, x);
-	}
-	else
-	{
-		set_cave_feat(y, x, feat_locked_door_random((d_info[dungeon_type].flags1 & DF1_GLASS_DOOR) ? DOOR_GLASS_DOOR : DOOR_DOOR));
-		cave[y][x].info &= ~(CAVE_FLOOR);
-		delete_monster(y, x);
-	}
-}
-
-/*!
- * @brief 隠しドアを配置する
- * @param y 配置したいフロアのY座標
- * @param x 配置したいフロアのX座標
- * @param type DOOR_DEFAULT / DOOR_DOOR / DOOR_GLASS_DOOR / DOOR_CURTAIN のいずれか
- * @return なし
- */
-void place_secret_door(int y, int x, int type)
-{
-	if (d_info[dungeon_type].flags1 & DF1_NO_DOORS)
-	{
-		place_floor_bold(y, x);
-	}
-	else
-	{
-		cave_type *c_ptr = &cave[y][x];
-
-		if (type == DOOR_DEFAULT)
-		{
-			type = ((d_info[dungeon_type].flags1 & DF1_CURTAIN) &&
-			        one_in_((d_info[dungeon_type].flags1 & DF1_NO_CAVE) ? 16 : 256)) ? DOOR_CURTAIN :
-			        ((d_info[dungeon_type].flags1 & DF1_GLASS_DOOR) ? DOOR_GLASS_DOOR : DOOR_DOOR);
-		}
-
-		/* Create secret door */
-		place_closed_door(y, x, type);
-
-		if (type != DOOR_CURTAIN)
-		{
-			/* Hide by inner wall because this is used in rooms only */
-			c_ptr->mimic = feat_wall_inner;
-
-			/* Floor type terrain cannot hide a door */
-			if (feat_supports_los(c_ptr->mimic) && !feat_supports_los(c_ptr->feat))
-			{
-				if (have_flag(f_info[c_ptr->mimic].flags, FF_MOVE) || have_flag(f_info[c_ptr->mimic].flags, FF_CAN_FLY))
-				{
-					c_ptr->feat = one_in_(2) ? c_ptr->mimic : floor_type[randint0(100)];
-				}
-				c_ptr->mimic = 0;
-			}
-		}
-
-		c_ptr->info &= ~(CAVE_FLOOR);
-		delete_monster(y, x);
-	}
-}
-
-/*!
  * @brief 1マスだけの部屋を作成し、上下左右いずれか一つに隠しドアを配置する。
  * @param y0 配置したい中心のY座標
  * @param x0 配置したい中心のX座標
@@ -1409,58 +1341,6 @@ void build_lake(int type)
 #endif /* ALLOW_CAVERNS_AND_LAKES */
 
 
-/*
- * Routine used by the random vault creators to add a door to a location
- * Note that range checking has to be done in the calling routine.
- *
- * The doors must be INSIDE the allocated region.
- */
-void add_door(int x, int y)
-{
-	/* Need to have a wall in the center square */
-	if (!is_outer_bold(y, x)) return;
-
-	/* look at:
-	 *  x#x
-	 *  .#.
-	 *  x#x
-	 *
-	 *  where x=don't care
-	 *  .=floor, #=wall
-	 */
-
-	if (is_floor_bold(y-1,x) && is_floor_bold(y+1,x) &&
-	    (is_outer_bold(y, x - 1) && is_outer_bold(y, x + 1)))
-	{
-		/* secret door */
-		place_secret_door(y, x, DOOR_DEFAULT);
-
-		/* set boundarys so don't get wide doors */
-		place_solid_bold(y, x - 1);
-		place_solid_bold(y, x + 1);
-	}
-
-
-	/* look at:
-	 *  x#x
-	 *  .#.
-	 *  x#x
-	 *
-	 *  where x = don't care
-	 *  .=floor, #=wall
-	 */
-	if (is_outer_bold(y - 1, x) && is_outer_bold(y + 1, x) &&
-	    is_floor_bold(y,x-1) && is_floor_bold(y,x+1))
-	{
-		/* secret door */
-		place_secret_door(y, x, DOOR_DEFAULT);
-
-		/* set boundarys so don't get wide doors */
-		place_solid_bold(y - 1, x);
-		place_solid_bold(y + 1, x);
-	}
-}
-
 
 /*
  * Routine that fills the empty areas of a room with treasure and monsters.
diff --git a/src/rooms.h b/src/rooms.h
index 76bef097a..fb2d0695a 100644
--- a/src/rooms.h
+++ b/src/rooms.h
@@ -81,8 +81,6 @@ extern void build_cavern(void);
 
 extern bool generate_rooms(void);
 extern void build_maze_vault(int x0, int y0, int xsize, int ysize, bool is_vault);
-extern void place_secret_door(int y, int x, int type);
-extern void place_locked_door(int y, int x);
 extern bool find_space(POSITION *y, POSITION *x, POSITION height, POSITION width);
 extern void build_small_room(int x0, int y0);
 extern void add_outer_wall(int x, int y, int light, int x1, int y1, int x2, int y2);
@@ -95,5 +93,4 @@ extern void fill_treasure(int x1, int x2, int y1, int y2, int difficulty);
 extern bool generate_lake(int y0, int x0, int xsize, int ysize, int c1, int c2, int c3, int type);
 extern void build_recursive_room(int x1, int y1, int x2, int y2, int power);
 extern void build_room(int x1, int x2, int y1, int y2);
-extern void add_door(int x, int y);
 extern void r_visit(int y1, int x1, int y2, int x2, int node, int dir, int *visited);