[Refactor] #2680 1箇所からしか呼ばれていないSMALL_LEVEL定数をfloor-generator.cpp に移した

diff --git a/src/floor/floor-generator.cpp b/src/floor/floor-generator.cpp
index 39a1d0e..15fd29a 100644 (file)
--- a/src/floor/floor-generator.cpp
+++ b/src/floor/floor-generator.cpp
@@ -289,13 +289,19 @@ static bool level_gen(PlayerType *player_ptr, concptr *why)
 {
     auto *floor_ptr = player_ptr->current_floor_ptr;
     DUNGEON_IDX d_idx = floor_ptr->dungeon_idx;
-    if ((always_small_levels || ironman_small_levels || (one_in_(SMALL_LEVEL) && small_levels) || dungeons_info[d_idx].flags.has(DungeonFeatureType::BEGINNER) || dungeons_info[d_idx].flags.has(DungeonFeatureType::SMALLEST)) && dungeons_info[d_idx].flags.has_not(DungeonFeatureType::BIG)) {
+    const auto &dungeon = dungeons_info[d_idx];
+    constexpr auto chance_small_floor = 3;
+    auto is_small_level = always_small_levels || ironman_small_levels;
+    is_small_level |= one_in_(chance_small_floor) && small_levels;
+    is_small_level |= dungeon.flags.has(DungeonFeatureType::BEGINNER);
+    is_small_level |= dungeon.flags.has(DungeonFeatureType::SMALLEST);
+    if (is_small_level && dungeon.flags.has_not(DungeonFeatureType::BIG)) {
         int level_height;
         int level_width;
-        if (dungeons_info[d_idx].flags.has(DungeonFeatureType::SMALLEST)) {
+        if (dungeon.flags.has(DungeonFeatureType::SMALLEST)) {
             level_height = 1;
             level_width = 1;
-        } else if (dungeons_info[d_idx].flags.has(DungeonFeatureType::BEGINNER)) {
+        } else if (dungeon.flags.has(DungeonFeatureType::BEGINNER)) {
             level_height = 2;
             level_width = 2;
         } else {

diff --git a/src/system/gamevalue.h b/src/system/gamevalue.h
index 97c73ac..5a3275a 100644 (file)
--- a/src/system/gamevalue.h
+++ b/src/system/gamevalue.h
@@ -57,7 +57,6 @@
 /*
  * Dungeon generation values
  */
-#define SMALL_LEVEL 3 /*!< 小さいフロアの生成される基本確率(1/定数) / 1/chance of smaller size (3) */
 #define EMPTY_LEVEL 24 /*!< アリーナレベル(外壁のないフロア)の生成される基本確率(1/定数) / 1/chance of being 'empty' (15) */
 #define LAKE_LEVEL 24 /*!< 川や湖のあるフロアの生成される確率(1/定数) / 1/chance of being a lake on the level */
 #define DARK_EMPTY 5 /*!< フロア全体が暗い可能性の基本確率(1/定数) / 1/chance of on_defeat_arena_monster level NOT being lit (2) */