From 089f131ab42a3352b87b202bb43319f5351e13b7 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Sun, 22 Dec 2019 12:14:15 +0900
Subject: [PATCH] =?utf8?q?[Fix]=20#38997=20generate=5Frooms()=20=E5=86=85?=
 =?utf8?q?=E5=A4=89=E6=95=B0=E5=8F=82=E7=85=A7=E4=BF=AE=E6=AD=A3=EF=BC=8E?=
 =?utf8?q?=20/=20Fix=20variable=20references=20in=20generate=5Frooms().?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/rooms.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/rooms.c b/src/rooms.c
index 7230f4aaf..7bb2fade9 100644
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -2161,7 +2161,7 @@ bool generate_rooms(floor_type *floor_ptr)
 	/*! @details ダンジョンにBEGINNER、CHAMELEON、SMALLESTいずれのフラグもなく、
 	 * かつ「常に通常でない部屋を生成する」フラグがONならば、
 	 * GRATER_VAULTのみを生成対象とする。 / Ironman sees only Greater Vaults */
-	if (ironman_rooms && !((d_info[p_ptr->dungeon_idx].flags1 & (DF1_BEGINNER | DF1_CHAMELEON | DF1_SMALLEST))))
+	if (ironman_rooms && !((d_info[floor_ptr->dungeon_idx].flags1 & (DF1_BEGINNER | DF1_CHAMELEON | DF1_SMALLEST))))
 	{
 		for (i = 0; i < ROOM_T_MAX; i++)
 		{
@@ -2171,7 +2171,7 @@ bool generate_rooms(floor_type *floor_ptr)
 	}
 
 	/*! @details ダンジョンにNO_VAULTフラグがあるならば、LESSER_VAULT / GREATER_VAULT/ RANDOM_VAULTを除外 / Forbidden vaults */
-	else if (d_info[p_ptr->dungeon_idx].flags1 & DF1_NO_VAULT)
+	else if (d_info[floor_ptr->dungeon_idx].flags1 & DF1_NO_VAULT)
 	{
 		prob_list[ROOM_T_LESSER_VAULT] = 0;
 		prob_list[ROOM_T_GREATER_VAULT] = 0;
@@ -2179,13 +2179,13 @@ bool generate_rooms(floor_type *floor_ptr)
 	}
 
 	/*! @details ダンジョンにBEGINNERフラグがあるならば、FIXED_ROOMを除外 / Forbidden vaults */
-	if (d_info[p_ptr->dungeon_idx].flags1 & DF1_BEGINNER)
+	if (d_info[floor_ptr->dungeon_idx].flags1 & DF1_BEGINNER)
 	{
 		prob_list[ROOM_T_FIXED] = 0;
 	}
 
 	/*! @details ダンジョンにNO_CAVEフラグがある場合、FRACAVEの生成枠がNORMALに与えられる。CRIPT、OVALの生成枠がINNER_Fに与えられる。/ NO_CAVE dungeon (Castle)*/
-	if (d_info[p_ptr->dungeon_idx].flags1 & DF1_NO_CAVE)
+	if (d_info[floor_ptr->dungeon_idx].flags1 & DF1_NO_CAVE)
 	{
 		MOVE_PLIST(ROOM_T_NORMAL, ROOM_T_FRACAVE);
 		MOVE_PLIST(ROOM_T_INNER_FEAT, ROOM_T_CRYPT);
@@ -2193,7 +2193,7 @@ bool generate_rooms(floor_type *floor_ptr)
 	}
 
 	/*! @details ダンジョンにCAVEフラグがある場合、NORMALの生成枠がFRACAVEに与えられる。/ CAVE dungeon (Orc floor_ptr->grid_array etc.) */
-	else if (d_info[p_ptr->dungeon_idx].flags1 & DF1_CAVE)
+	else if (d_info[floor_ptr->dungeon_idx].flags1 & DF1_CAVE)
 	{
 		MOVE_PLIST(ROOM_T_FRACAVE, ROOM_T_NORMAL);
 	}
@@ -2205,13 +2205,13 @@ bool generate_rooms(floor_type *floor_ptr)
 	}
 
 	/*! @details ダンジョンに最初からGLASS_ROOMフラグがある場合、GLASS を生成から除外。/ Forbidden glass rooms */
-	if (!(d_info[p_ptr->dungeon_idx].flags1 & DF1_GLASS_ROOM))
+	if (!(d_info[floor_ptr->dungeon_idx].flags1 & DF1_GLASS_ROOM))
 	{
 		prob_list[ROOM_T_GLASS] = 0;
 	}
 
 	/*! @details ARCADEは同フラグがダンジョンにないと生成されない。 / Forbidden glass rooms */
-	if (!(d_info[p_ptr->dungeon_idx].flags1 & DF1_ARCADE))
+	if (!(d_info[floor_ptr->dungeon_idx].flags1 & DF1_ARCADE))
 	{
 		prob_list[ROOM_T_ARCADE] = 0;
 	}
-- 
2.11.0