From cc6a90bd2a8d87c7c9a72039d25bf8014f428ba6 Mon Sep 17 00:00:00 2001
From: Habu <habu1010+github@gmail.com>
Date: Sat, 21 Aug 2021 14:12:18 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=202=E8=BB=92=E7=9B=AE=E4=BB=A5?=
 =?utf8?q?=E9=99=8D=E3=81=AE=E3=83=96=E3=83=A9=E3=83=83=E3=82=AF=E3=83=9E?=
 =?utf8?q?=E3=83=BC=E3=82=B1=E3=83=83=E3=83=88=E3=82=92=E7=94=9F=E6=88=90?=
 =?utf8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?=
 =?utf8?q?=E3=82=8B=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

今後とも地下街を同一フロアに2つ以上生成する事はなさそうなので、
ブラックマーケットが2軒生成される事は無いと判断し当該コードを削除する。
---
 src/room/rooms-city.cpp | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/room/rooms-city.cpp b/src/room/rooms-city.cpp
index 19e2ec8cc..2986fd98b 100644
--- a/src/room/rooms-city.cpp
+++ b/src/room/rooms-city.cpp
@@ -187,26 +187,9 @@ bool build_type16(player_type *player_ptr, dun_data_type *dd_ptr)
         STORE_BOOK,
     };
     int n = sizeof stores / sizeof(int);
-    POSITION i, y, x, y1, x1, yval, xval;
+    POSITION y1, x1, yval, xval;
     int town_hgt = rand_range(MIN_TOWN_HGT, MAX_TOWN_HGT);
     int town_wid = rand_range(MIN_TOWN_WID, MAX_TOWN_WID);
-    bool prevent_bm = false;
-    floor_type *floor_ptr = player_ptr->current_floor_ptr;
-
-    // If already exist black market, prevent building
-    for (y = 0; (y < floor_ptr->height) && !prevent_bm; y++) {
-        for (x = 0; x < floor_ptr->width; x++) {
-            const auto f_ptr = &f_info[floor_ptr->grid_array[y][x].feat];
-            if (f_ptr->flags.has(FF::STORE) && f_ptr->subtype == STORE_BLACK) {
-                prevent_bm = true;
-                break;
-            }
-        }
-    }
-
-    for (i = 0; i < n; i++)
-        if ((stores[i] == STORE_BLACK) && prevent_bm)
-            stores[i] = stores[--n];
 
     if (!n)
         return false;
-- 
2.11.0