[Refactor] FORCE_DEPTHを新定義に合わせた

diff --git a/src/lore/monster-lore.cpp b/src/lore/monster-lore.cpp
index 0035b0a..b1aa107 100644 (file)
--- a/src/lore/monster-lore.cpp
+++ b/src/lore/monster-lore.cpp
@@ -14,6 +14,7 @@
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-indice-types.h"
+#include "monster-race/race-misc-flags.h"
 #include "monster-race/race-sex-const.h"
 #include "player-ability/player-ability-types.h"
 #include "system/angband.h"
@@ -114,8 +115,8 @@ static void set_race_flags(lore_type *lore_ptr)
         lore_ptr->kind_flags.set(MonsterKindType::QUANTUM);
     }
 
-    if (lore_ptr->r_ptr->flags1 & RF1_FORCE_DEPTH) {
-        lore_ptr->flags1 |= (RF1_FORCE_DEPTH);
+    if (lore_ptr->r_ptr->misc_flags.has(MonsterMiscType::FORCE_DEPTH)) {
+        lore_ptr->misc_flags.set(MonsterMiscType::FORCE_DEPTH);
     }
 
     if (lore_ptr->r_ptr->flags1 & RF1_FORCE_MAXHP) {

diff --git a/src/monster-floor/one-monster-placer.cpp b/src/monster-floor/one-monster-placer.cpp
index 8de1ef9..7debe5d 100644 (file)
--- a/src/monster-floor/one-monster-placer.cpp
+++ b/src/monster-floor/one-monster-placer.cpp
@@ -29,6 +29,7 @@
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
+#include "monster-race/race-misc-flags.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-list.h"
@@ -143,7 +144,7 @@ static bool check_unique_placeable(const FloorType &floor, MonsterRaceId r_idx,
         return false;
     }
 
-    const auto is_deep = any_bits(r_ptr->flags1, RF1_FORCE_DEPTH) && (floor.dun_level < r_ptr->level);
+    const auto is_deep = r_ptr->misc_flags.has(MonsterMiscType::FORCE_DEPTH) && (floor.dun_level < r_ptr->level);
     const auto is_questor = !ironman_nightmare || any_bits(r_ptr->flags1, RF1_QUESTOR);
     return !is_deep || !is_questor;
 }

diff --git a/src/monster-race/monster-race-hook.cpp b/src/monster-race/monster-race-hook.cpp
index 221fc37..fe348fc 100644 (file)
--- a/src/monster-race/monster-race-hook.cpp
+++ b/src/monster-race/monster-race-hook.cpp
@@ -12,6 +12,7 @@
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-flags8.h"
 #include "monster-race/race-indice-types.h"
+#include "monster-race/race-misc-flags.h"
 #include "monster/monster-list.h"
 #include "monster/monster-util.h"
 #include "player/player-status.h"
@@ -909,7 +910,7 @@ bool item_monster_okay(PlayerType *player_ptr, MonsterRaceId r_idx)
         return false;
     }
 
-    if (any_bits(r_ptr->flags1, RF1_FORCE_DEPTH)) {
+    if (r_ptr->misc_flags.has(MonsterMiscType::FORCE_DEPTH)) {
         return false;
     }
 

diff --git a/src/monster/monster-util.cpp b/src/monster/monster-util.cpp
index bd05e4f..cbb7314 100644 (file)
--- a/src/monster/monster-util.cpp
+++ b/src/monster/monster-util.cpp
@@ -10,6 +10,7 @@
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
+#include "monster-race/race-misc-flags.h"
 #include "spell/summon-types.h"
 #include "system/alloc-entries.h"
 #include "system/angband-system.h"
@@ -289,8 +290,8 @@ static errr do_get_mon_num_prep(PlayerType *player_ptr, const monsterrace_hook_t
                 continue;
             }
 
-            // RF1_FORCE_DEPTH フラグ持ちは指定階未満では生成禁止。
-            if ((r_ptr->flags1 & RF1_FORCE_DEPTH) && (r_ptr->level > floor_ptr->dun_level)) {
+            // FORCE_DEPTH フラグ持ちは指定階未満では生成禁止。
+            if (r_ptr->misc_flags.has(MonsterMiscType::FORCE_DEPTH) && (r_ptr->level > floor_ptr->dun_level)) {
                 continue;
             }