From 3bb56360b35fa0a3a69924fbbcd391ee9ea59976 Mon Sep 17 00:00:00 2001 From: mogami Date: Wed, 23 Oct 2002 07:40:44 +0000 Subject: [PATCH] =?utf8?q?=E7=BD=A0=E3=83=94=E3=83=83=E3=83=88=E3=81=8C?= =?utf8?q?=E5=A3=81=E3=81=AE=E4=B8=AD=E3=81=AB=E5=AD=A4=E7=AB=8B=E3=81=97?= =?utf8?q?=E3=81=A6=E3=81=84=E3=82=8B=E4=BA=8B=E3=81=8C=E3=81=82=E3=82=8B?= =?utf8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3=E3=80=82=20=E9=83=A8?= =?utf8?q?=E5=B1=8B=E3=81=AE=E4=B8=AD=E3=81=AE=E3=82=B0=E3=83=AA=E3=83=83?= =?utf8?q?=E3=83=89=E3=81=AFCAVE=5FFLOOR=E3=81=A7=E5=9F=8B=E3=82=81?= =?utf8?q?=E3=81=A6=E3=81=8A=E3=81=8B=E3=81=AA=E3=81=84=E3=81=A8=E3=81=86?= =?utf8?q?=E3=81=BE=E3=81=8F=E3=83=88=E3=83=B3=E3=83=8D=E3=83=AB=E3=81=8C?= =?utf8?q?=E7=B9=8B=E3=81=8C=E3=82=89=E3=81=AA=E3=81=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/rooms.c | 55 ++++++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/src/rooms.c b/src/rooms.c index 2c1eed2c4..dbd93d5e9 100644 --- a/src/rooms.c +++ b/src/rooms.c @@ -5238,7 +5238,8 @@ static void build_type13(int by0, int bx0) for (x = x1 - 1; x <= x2 + 1; x++) { c_ptr = &cave[y][x]; - place_solid_grid(c_ptr); + place_inner_grid(c_ptr); + c_ptr->info |= (CAVE_ROOM); } } @@ -5247,12 +5248,10 @@ static void build_type13(int by0, int bx0) { c_ptr = &cave[yval-2][x]; place_floor_grid(c_ptr); - c_ptr->info |= (CAVE_ROOM); add_cave_info(yval-2, x, CAVE_ICKY); c_ptr = &cave[yval+2][x]; place_floor_grid(c_ptr); - c_ptr->info |= (CAVE_ROOM); add_cave_info(yval+2, x, CAVE_ICKY); } @@ -5261,12 +5260,10 @@ static void build_type13(int by0, int bx0) { c_ptr = &cave[yval-3][x]; place_floor_grid(c_ptr); - c_ptr->info |= (CAVE_ROOM); add_cave_info(yval-3, x, CAVE_ICKY); c_ptr = &cave[yval+3][x]; place_floor_grid(c_ptr); - c_ptr->info |= (CAVE_ROOM); add_cave_info(yval+3, x, CAVE_ICKY); } @@ -5281,50 +5278,50 @@ static void build_type13(int by0, int bx0) place_floor_grid(c_ptr); } + /* Place the outer walls */ + for (y = y1 - 1; y <= y2 + 1; y++) + { + c_ptr = &cave[y][x1 - 1]; + place_outer_grid(c_ptr); + c_ptr = &cave[y][x2 + 1]; + place_outer_grid(c_ptr); + } + for (x = x1 - 1; x <= x2 + 1; x++) + { + c_ptr = &cave[y1 - 1][x]; + place_outer_grid(c_ptr); + c_ptr = &cave[y2 + 1][x]; + place_outer_grid(c_ptr); + } + /* Random corridor */ if (one_in_(2)) { for (y = y1; y <= yval; y++) { - c_ptr = &cave[y][x1]; - place_floor_grid(c_ptr); + place_floor_bold(y, x2); + place_solid_bold(y, x1-1); } for (y = yval; y <= y2 + 1; y++) { - c_ptr = &cave[y][x2]; - place_floor_grid(c_ptr); + place_floor_bold(y, x1); + place_solid_bold(y, x2+1); } } else { for (y = yval; y <= y2 + 1; y++) { - c_ptr = &cave[y][x1]; - place_floor_grid(c_ptr); + place_floor_bold(y, x1); + place_solid_bold(y, x2+1); } for (y = y1; y <= yval; y++) { - c_ptr = &cave[y][x2]; - place_floor_grid(c_ptr); + place_floor_bold(y, x2); + place_solid_bold(y, x1-1); } } - /* Place the outer walls */ - for (y = y1 - 1; y <= y2 + 1; y++) - { - c_ptr = &cave[y][x1 - 1]; - place_outer_grid(c_ptr); - c_ptr = &cave[y][x2 + 1]; - place_outer_grid(c_ptr); - } - for (x = x1 - 1; x <= x2 + 1; x++) - { - c_ptr = &cave[y1 - 1][x]; - place_outer_grid(c_ptr); - c_ptr = &cave[y2 + 1][x]; - place_outer_grid(c_ptr); - } - /* Place the wall open trap */ cave[yval][xval].mimic = cave[yval][xval].feat; cave[yval][xval].feat = FEAT_TRAP_OPEN; -- 2.11.0