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

diff --git a/src/grid/feature-generator.cpp b/src/grid/feature-generator.cpp
index 803f930..538de49 100644 (file)
--- a/src/grid/feature-generator.cpp
+++ b/src/grid/feature-generator.cpp
@@ -30,7 +30,8 @@ void gen_caverns_and_lakes(PlayerType *player_ptr, dungeon_type *dungeon_ptr, du
         build_lake(player_ptr, one_in_(2) ? LAKE_T_CAVE : LAKE_T_EARTH_VAULT);
     }
 
-    if (one_in_(LAKE_LEVEL) && !dd_ptr->empty_level && !dd_ptr->destroyed && dungeon_ptr->flags.has_any_of(DF_LAKE_MASK)) {
+    constexpr auto chance_water = 24;
+    if (one_in_(chance_water) && !dd_ptr->empty_level && !dd_ptr->destroyed && dungeon_ptr->flags.has_any_of(DF_LAKE_MASK)) {
         int count = 0;
         if (dungeon_ptr->flags.has(DungeonFeatureType::LAKE_WATER)) {
             count += 3;

diff --git a/src/system/gamevalue.h b/src/system/gamevalue.h
index 7652c05..bbe6c6e 100644 (file)
--- a/src/system/gamevalue.h
+++ b/src/system/gamevalue.h
@@ -57,7 +57,6 @@
 /*
  * Dungeon generation values
  */
-#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) */
 #define DUN_CAVERN 20 /*!< 洞窟状のダンジョンが生成される基本確率(1/定数) / 1/chance of having a cavern level */