[Refactor] #40233 Moved has_river_flag() from floor.h to floor-generate.c

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index c19b02b..0a9538f 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -498,6 +498,10 @@ static void gen_caverns_and_lakes(dungeon_type *dungeon_ptr, player_type *owner_
        if (quest_number(owner_ptr, floor_ptr->dun_level)) dun->destroyed = FALSE;
 }
 
+static bool has_river_flag(dungeon_type *dungeon_ptr)
+{
+    return dungeon_ptr->flags1 & (DF1_WATER_RIVER | DF1_LAVA_RIVER | DF1_ACID_RIVER | DF1_POISONOUS_RIVER);
+}
 
 /*!
  * @brief ダンジョン生成のメインルーチン / Generate a new dungeon level
@@ -651,7 +655,7 @@ static bool cave_gen(player_type *player_ptr, concptr *why)
                        destroy_level(player_ptr);
                }
 
-               if (HAS_RIVER_FLAG(dungeon_ptr) && one_in_(3) && (randint1(floor_ptr->dun_level) > 5))
+               if (has_river_flag(dungeon_ptr) && one_in_(3) && (randint1(floor_ptr->dun_level) > 5))
                {
                        add_river(floor_ptr);
                }

diff --git a/src/floor/floor.h b/src/floor/floor.h
index c04b0bb..5458be3 100644 (file)
--- a/src/floor/floor.h
+++ b/src/floor/floor.h
@@ -41,8 +41,6 @@ extern floor_type floor_info;
 
 #define DF1_LAKE_MASK (DF1_LAKE_WATER | DF1_LAKE_LAVA | DF1_LAKE_RUBBLE | DF1_LAKE_TREE | DF1_LAKE_POISONOUS | DF1_LAKE_ACID)
 
-#define HAS_RIVER_FLAG(D_PTR) ((D_PTR)->flags1 & (DF1_WATER_RIVER | DF1_LAVA_RIVER | DF1_ACID_RIVER | DF1_POISONOUS_RIVER))
-
 /*
  * Determines if a map location is fully inside the outer walls
  */