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

diff --git a/src/grid/feature-generator.cpp b/src/grid/feature-generator.cpp
index 538de49..db0b066 100644 (file)
--- a/src/grid/feature-generator.cpp
+++ b/src/grid/feature-generator.cpp
@@ -98,7 +98,14 @@ void gen_caverns_and_lakes(PlayerType *player_ptr, dungeon_type *dungeon_ptr, du
         }
     }
 
-    if ((floor_ptr->dun_level > DUN_CAVERN) && !dd_ptr->empty_level && dungeon_ptr->flags.has(DungeonFeatureType::CAVERN) && !dd_ptr->laketype && !dd_ptr->destroyed && (randint1(1000) < floor_ptr->dun_level)) {
+    constexpr auto can_become_cavern = 20;
+    auto should_build_cavern = floor_ptr->dun_level > can_become_cavern;
+    should_build_cavern &= !dd_ptr->empty_level;
+    should_build_cavern &= dungeon_ptr->flags.has(DungeonFeatureType::CAVERN);
+    should_build_cavern &= dd_ptr->laketype == 0;
+    should_build_cavern &= !dd_ptr->destroyed;
+    should_build_cavern &= randint1(1000) < floor_ptr->dun_level;
+    if (should_build_cavern) {
         dd_ptr->cavern = true;
         msg_print_wizard(player_ptr, CHEAT_DUNGEON, _("洞窟を生成。", "Cavern on level."));
         build_cavern(player_ptr);

diff --git a/src/system/gamevalue.h b/src/system/gamevalue.h
index e37e485..998c9ea 100644 (file)
--- a/src/system/gamevalue.h
+++ b/src/system/gamevalue.h
@@ -55,11 +55,6 @@
 #define MAX_VAMPIRIC_DRAIN 50 /*!< 吸血処理の最大回復HP */
 
 /*
- * Dungeon generation values
- */
-#define DUN_CAVERN 20 /*!< 洞窟状のダンジョンが生成される基本確率(1/定数) / 1/chance of having a cavern level */
-
-/*
  * Dungeon streamer generation values
  */
 #define DUN_STR_DEN 5 /* Density of streamers */