From d93fe8626b3b51507ea1ee09c49e5d501b1c500d Mon Sep 17 00:00:00 2001
From: Deskull <desull@users.sourceforge.jp>
Date: Sun, 25 Jun 2017 23:18:23 +0900
Subject: [PATCH] =?utf8?q?#37287=20rooms.c=E5=86=85=E3=81=AEC4457=E8=AD=A6?=
 =?utf8?q?=E5=91=8A=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=80=82=E3=82=BD=E3=83=BC?=
 =?utf8?q?=E3=82=B9=E3=82=B3=E3=83=BC=E3=83=89=E6=95=B4=E5=BD=A2=E3=80=82?=
 =?utf8?q?=20/=20Deal=20C4457=20warning=20in=20rooms.c.=20Source=20code=20?=
 =?utf8?q?formatting.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/generate.h |  1 -
 src/rooms.c    | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/generate.h b/src/generate.h
index e16c3f7c8..32bc28a78 100644
--- a/src/generate.h
+++ b/src/generate.h
@@ -35,7 +35,6 @@
 #define DUN_TUN_JCT_MIN 60 /* Chance of doors at tunnel junctions (was 90) */
 #define DUN_TUN_JCT_MAX 90
 
-extern int dun_rooms;
 
 extern int dun_tun_rnd; /*!< ダンジョンの通路方向を掻き回す頻度(一回の試行ごとに%で判定している) */
 extern int dun_tun_chg; /*!< ダンジョンの通路をクランクさせる頻度(一回の試行ごとに%で判定している) */
diff --git a/src/rooms.c b/src/rooms.c
index 18418a842..0eac21d5a 100644
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -4379,23 +4379,23 @@ static void build_bubble_vault(int x0, int y0, int xsize, int ysize)
 	/* Top and bottom boundaries */
 	for (i = 0; i < xsize; i++)
 	{
-		int x = x0 - xhsize + i;
+		int side_x = x0 - xhsize + i;
 
-		place_outer_noperm_bold(y0 - yhsize + 0, x);
-		cave[y0 - yhsize + 0][x].info |= (CAVE_ROOM | CAVE_ICKY);
-		place_outer_noperm_bold(y0 - yhsize + ysize - 1, x);
-		cave[y0 - yhsize + ysize - 1][x].info |= (CAVE_ROOM | CAVE_ICKY);
+		place_outer_noperm_bold(y0 - yhsize + 0, side_x);
+		cave[y0 - yhsize + 0][side_x].info |= (CAVE_ROOM | CAVE_ICKY);
+		place_outer_noperm_bold(y0 - yhsize + ysize - 1, side_x);
+		cave[y0 - yhsize + ysize - 1][side_x].info |= (CAVE_ROOM | CAVE_ICKY);
 	}
 
 	/* Left and right boundaries */
 	for (i = 1; i < ysize - 1; i++)
 	{
-		int y = y0 - yhsize + i;
+		int side_y = y0 - yhsize + i;
 
-		place_outer_noperm_bold(y, x0 - xhsize + 0);
-		cave[y][x0 - xhsize + 0].info |= (CAVE_ROOM | CAVE_ICKY);
-		place_outer_noperm_bold(y, x0 - xhsize + xsize - 1);
-		cave[y][x0 - xhsize + xsize - 1].info |= (CAVE_ROOM | CAVE_ICKY);
+		place_outer_noperm_bold(side_y, x0 - xhsize + 0);
+		cave[side_y][x0 - xhsize + 0].info |= (CAVE_ROOM | CAVE_ICKY);
+		place_outer_noperm_bold(side_y, x0 - xhsize + xsize - 1);
+		cave[side_y][x0 - xhsize + xsize - 1].info |= (CAVE_ROOM | CAVE_ICKY);
 	}
 
 	/* Fill in middle with bubbles */
-- 
2.11.0