[Refactor] enum classの型名変更 MFLAG -> MonsterTemporaryFlagType

#1824にて議論されていたフォーマット統一処理。
MFLAGをMonsterTemporaryFlagTypeに名称変更する。

diff --git a/src/core/player-processor.cpp b/src/core/player-processor.cpp
index 4db8864..8276ed2 100644 (file)
--- a/src/core/player-processor.cpp
+++ b/src/core/player-processor.cpp
@@ -344,12 +344,12 @@ void process_player(player_type *player_ptr)
                 }
 
                 // 出現して即魔法を使わないようにするフラグを落とす処理
-                if (m_ptr->mflag.has(MFLAG::PREVENT_MAGIC)) {
-                    m_ptr->mflag.reset(MFLAG::PREVENT_MAGIC);
+                if (m_ptr->mflag.has(MonsterTemporaryFlagType::PREVENT_MAGIC)) {
+                    m_ptr->mflag.reset(MonsterTemporaryFlagType::PREVENT_MAGIC);
                 }
 
-                if (m_ptr->mflag.has(MFLAG::SANITY_BLAST)) {
-                    m_ptr->mflag.reset(MFLAG::SANITY_BLAST);
+                if (m_ptr->mflag.has(MonsterTemporaryFlagType::SANITY_BLAST)) {
+                    m_ptr->mflag.reset(MonsterTemporaryFlagType::SANITY_BLAST);
                     sanity_blast(player_ptr, m_ptr, false);
                 }
 

diff --git a/src/floor/floor-changer.cpp b/src/floor/floor-changer.cpp
index 7a07dfe..d498837 100644 (file)
--- a/src/floor/floor-changer.cpp
+++ b/src/floor/floor-changer.cpp
@@ -111,7 +111,7 @@ static void set_pet_params(player_type *player_ptr, monster_race **r_ptr, const
     m_ptr->hold_o_idx_list.clear();
     m_ptr->target_y = 0;
     if (((*r_ptr)->flags1 & RF1_PREVENT_SUDDEN_MAGIC) && !ironman_nightmare) {
-        m_ptr->mflag.set(MFLAG::PREVENT_MAGIC);
+        m_ptr->mflag.set(MonsterTemporaryFlagType::PREVENT_MAGIC);
     }
 }
 

diff --git a/src/monster-floor/monster-move.cpp b/src/monster-floor/monster-move.cpp
index 30f6da8..cccd0e3 100644 (file)
--- a/src/monster-floor/monster-move.cpp
+++ b/src/monster-floor/monster-move.cpp
@@ -412,7 +412,7 @@ bool process_monster_movement(player_type *player_ptr, turn_flags *turn_flags_pt
 
         monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
         if (m_ptr->ml
-            && (disturb_move || (disturb_near && m_ptr->mflag.has(MFLAG::VIEW) && projectable(player_ptr, player_ptr->y, player_ptr->x, m_ptr->fy, m_ptr->fx))
+            && (disturb_move || (disturb_near && m_ptr->mflag.has(MonsterTemporaryFlagType::VIEW) && projectable(player_ptr, player_ptr->y, player_ptr->x, m_ptr->fy, m_ptr->fx))
                 || (disturb_high && ap_r_ptr->r_tkills && ap_r_ptr->level >= player_ptr->lev))) {
             if (is_hostile(m_ptr))
                 disturb(player_ptr, false, true);

diff --git a/src/monster-floor/one-monster-placer.cpp b/src/monster-floor/one-monster-placer.cpp
index 0b3bd10..a048c0b 100644 (file)
--- a/src/monster-floor/one-monster-placer.cpp
+++ b/src/monster-floor/one-monster-placer.cpp
@@ -366,11 +366,11 @@ bool place_monster_one(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS
     }
 
     if (any_bits(r_ptr->flags1, RF1_PREVENT_SUDDEN_MAGIC) && !ironman_nightmare) {
-        m_ptr->mflag.set(MFLAG::PREVENT_MAGIC);
+        m_ptr->mflag.set(MonsterTemporaryFlagType::PREVENT_MAGIC);
     }
 
     if (g_ptr->m_idx < hack_m_idx) {
-        m_ptr->mflag.set(MFLAG::BORN);
+        m_ptr->mflag.set(MonsterTemporaryFlagType::BORN);
     }
 
     if (any_bits(r_ptr->flags7, RF7_SELF_LD_MASK))

diff --git a/src/monster/monster-flag-types.h b/src/monster/monster-flag-types.h
index e313824..fb470be 100644 (file)
--- a/src/monster/monster-flag-types.h
+++ b/src/monster/monster-flag-types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-enum class MFLAG {
+enum class MonsterTemporaryFlagType {
     VIEW = 0, /* Monster is in line of sight */
     LOS = 1, /* Monster is marked for project_all_los(player_ptr, ) */
     ESP = 2, /* Monster is being sensed by ESP */

diff --git a/src/monster/monster-processor.cpp b/src/monster/monster-processor.cpp
index 54a8dd7..24d1892 100644 (file)
--- a/src/monster/monster-processor.cpp
+++ b/src/monster/monster-processor.cpp
@@ -552,8 +552,8 @@ void sweep_monster_process(player_type *player_ptr)
         if (!monster_is_valid(m_ptr) || player_ptr->wild_mode)
             continue;
 
-        if (m_ptr->mflag.has(MFLAG::BORN)) {
-            m_ptr->mflag.reset(MFLAG::BORN);
+        if (m_ptr->mflag.has(MonsterTemporaryFlagType::BORN)) {
+            m_ptr->mflag.reset(MonsterTemporaryFlagType::BORN);
             continue;
         }
 

diff --git a/src/monster/monster-update.cpp b/src/monster/monster-update.cpp
index 4824293..c132384 100644 (file)
--- a/src/monster/monster-update.cpp
+++ b/src/monster/monster-update.cpp
@@ -221,7 +221,7 @@ static bool update_weird_telepathy(player_type *player_ptr, um_type *um_ptr, MON
         return true;
 
     um_ptr->flag = true;
-    um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+    um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
     if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated) {
         r_ptr->r_flags2 |= RF2_WEIRD_MIND;
         update_smart_stupid_flags(r_ptr);
@@ -235,7 +235,7 @@ static void update_telepathy_sight(player_type *player_ptr, um_type *um_ptr, MON
     monster_race *r_ptr = &r_info[um_ptr->m_ptr->r_idx];
     if (PlayerClass(player_ptr).samurai_stance_is(SamuraiStance::MUSOU)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             update_smart_stupid_flags(r_ptr);
 
@@ -256,7 +256,7 @@ static void update_telepathy_sight(player_type *player_ptr, um_type *um_ptr, MON
         return;
 
     um_ptr->flag = true;
-    um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+    um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
     if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
         update_smart_stupid_flags(r_ptr);
 }
@@ -266,84 +266,84 @@ static void update_specific_race_telepathy(player_type *player_ptr, um_type *um_
     monster_race *r_ptr = &r_info[um_ptr->m_ptr->r_idx];
     if ((player_ptr->esp_animal) && (r_ptr->flags3 & RF3_ANIMAL)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags3 |= RF3_ANIMAL;
     }
 
     if ((player_ptr->esp_undead) && (r_ptr->flags3 & RF3_UNDEAD)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags3 |= RF3_UNDEAD;
     }
 
     if ((player_ptr->esp_demon) && (r_ptr->flags3 & RF3_DEMON)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags3 |= RF3_DEMON;
     }
 
     if ((player_ptr->esp_orc) && (r_ptr->flags3 & RF3_ORC)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags3 |= RF3_ORC;
     }
 
     if ((player_ptr->esp_troll) && (r_ptr->flags3 & RF3_TROLL)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags3 |= RF3_TROLL;
     }
 
     if ((player_ptr->esp_giant) && (r_ptr->flags3 & RF3_GIANT)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags3 |= RF3_GIANT;
     }
 
     if ((player_ptr->esp_dragon) && (r_ptr->flags3 & RF3_DRAGON)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags3 |= RF3_DRAGON;
     }
 
     if ((player_ptr->esp_human) && (r_ptr->flags2 & RF2_HUMAN)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags2 |= RF2_HUMAN;
     }
 
     if ((player_ptr->esp_evil) && (r_ptr->flags3 & RF3_EVIL)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags3 |= RF3_EVIL;
     }
 
     if ((player_ptr->esp_good) && (r_ptr->flags3 & RF3_GOOD)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags3 |= RF3_GOOD;
     }
 
     if ((player_ptr->esp_nonliving) && ((r_ptr->flags3 & (RF3_DEMON | RF3_UNDEAD | RF3_NONLIVING)) == RF3_NONLIVING)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags3 |= RF3_NONLIVING;
     }
 
     if ((player_ptr->esp_unique) && (r_ptr->flags1 & RF1_UNIQUE)) {
         um_ptr->flag = true;
-        um_ptr->m_ptr->mflag.set(MFLAG::ESP);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::ESP);
         if (is_original_ap(um_ptr->m_ptr) && !player_ptr->hallucinated)
             r_ptr->r_flags1 |= RF1_UNIQUE;
     }
@@ -392,7 +392,7 @@ static void decide_sight_invisible_monster(player_type *player_ptr, um_type *um_
     POSITION distance = decide_updated_distance(player_ptr, um_ptr);
     monster_race *r_ptr = &r_info[um_ptr->m_ptr->r_idx];
 
-    um_ptr->m_ptr->mflag.reset(MFLAG::ESP);
+    um_ptr->m_ptr->mflag.reset(MonsterTemporaryFlagType::ESP);
 
     if (distance > (um_ptr->in_darkness ? MAX_SIGHT / 2 : MAX_SIGHT))
         return;
@@ -455,7 +455,7 @@ static void update_invisible_monster(player_type *player_ptr, um_type *um_ptr, M
 
     if (w_ptr->is_loading_now && w_ptr->character_dungeon && !player_ptr->phase_out
         && r_info[um_ptr->m_ptr->ap_r_idx].flags2 & RF2_ELDRITCH_HORROR)
-        um_ptr->m_ptr->mflag.set(MFLAG::SANITY_BLAST);
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::SANITY_BLAST);
 
     if (disturb_near
         && (projectable(player_ptr, um_ptr->m_ptr->fy, um_ptr->m_ptr->fx, player_ptr->y, player_ptr->x)
@@ -488,8 +488,8 @@ static bool update_clear_monster(player_type *player_ptr, um_type *um_ptr)
     if (!um_ptr->easy)
         return false;
 
-    if (um_ptr->m_ptr->mflag.has_not(MFLAG::VIEW)) {
-        um_ptr->m_ptr->mflag.set(MFLAG::VIEW);
+    if (um_ptr->m_ptr->mflag.has_not(MonsterTemporaryFlagType::VIEW)) {
+        um_ptr->m_ptr->mflag.set(MonsterTemporaryFlagType::VIEW);
         if (um_ptr->do_disturb && (disturb_pets || is_hostile(um_ptr->m_ptr)))
             disturb(player_ptr, true, true);
     }
@@ -521,10 +521,10 @@ void update_monster(player_type *player_ptr, MONSTER_IDX m_idx, bool full)
     else
         update_visible_monster(player_ptr, um_ptr, m_idx);
 
-    if (update_clear_monster(player_ptr, um_ptr) || um_ptr->m_ptr->mflag.has_not(MFLAG::VIEW))
+    if (update_clear_monster(player_ptr, um_ptr) || um_ptr->m_ptr->mflag.has_not(MonsterTemporaryFlagType::VIEW))
         return;
 
-    um_ptr->m_ptr->mflag.reset(MFLAG::VIEW);
+    um_ptr->m_ptr->mflag.reset(MonsterTemporaryFlagType::VIEW);
     if (um_ptr->do_disturb && (disturb_pets || is_hostile(um_ptr->m_ptr)))
         disturb(player_ptr, true, true);
 }

diff --git a/src/mspell/mspell-attack.cpp b/src/mspell/mspell-attack.cpp
index 50a9ec2..ba0c8ec 100644 (file)
--- a/src/mspell/mspell-attack.cpp
+++ b/src/mspell/mspell-attack.cpp
@@ -304,7 +304,7 @@ bool make_attack_spell(player_type *player_ptr, MONSTER_IDX m_idx)
         return false;
     }
 
-    if (msa_ptr->m_ptr->mflag.has(MFLAG::PREVENT_MAGIC) || !is_hostile(msa_ptr->m_ptr)
+    if (msa_ptr->m_ptr->mflag.has(MonsterTemporaryFlagType::PREVENT_MAGIC) || !is_hostile(msa_ptr->m_ptr)
         || ((msa_ptr->m_ptr->cdis > get_max_range(player_ptr)) && !msa_ptr->m_ptr->target_y))
         return false;
 

diff --git a/src/spell-kind/spells-sight.cpp b/src/spell-kind/spells-sight.cpp
index 818a607..bafe0a4 100644 (file)
--- a/src/spell-kind/spells-sight.cpp
+++ b/src/spell-kind/spells-sight.cpp
@@ -56,17 +56,17 @@ bool project_all_los(player_type *player_ptr, AttributeType typ, HIT_POINT dam)
         if (!player_has_los_bold(player_ptr, y, x) || !projectable(player_ptr, player_ptr->y, player_ptr->x, y, x))
             continue;
 
-        m_ptr->mflag.set(MFLAG::LOS);
+        m_ptr->mflag.set(MonsterTemporaryFlagType::LOS);
     }
 
     BIT_FLAGS flg = PROJECT_JUMP | PROJECT_KILL | PROJECT_HIDE;
     bool obvious = false;
     for (MONSTER_IDX i = 1; i < player_ptr->current_floor_ptr->m_max; i++) {
         monster_type *m_ptr = &player_ptr->current_floor_ptr->m_list[i];
-        if (m_ptr->mflag.has_not(MFLAG::LOS))
+        if (m_ptr->mflag.has_not(MonsterTemporaryFlagType::LOS))
             continue;
 
-        m_ptr->mflag.reset(MFLAG::LOS);
+        m_ptr->mflag.reset(MonsterTemporaryFlagType::LOS);
         POSITION y = m_ptr->fy;
         POSITION x = m_ptr->fx;
 

diff --git a/src/system/monster-type-definition.h b/src/system/monster-type-definition.h
index 90e9ece..04df461 100644 (file)
--- a/src/system/monster-type-definition.h
+++ b/src/system/monster-type-definition.h
@@ -38,7 +38,7 @@ typedef struct monster_type {
        SPEED mspeed{};         /*!< モンスターの個体加速値 / Monster "speed" */
        ACTION_ENERGY energy_need{};    /*!< モンスター次ターンまでに必要な行動エネルギー / Monster "energy" */
        POSITION cdis{};                /*!< 現在のプレイヤーから距離(逐一計算を避けるためのテンポラリ変数) Current dis from player */
-       EnumClassFlagGroup<MFLAG> mflag{};      /*!< モンスター個体に与えられた特殊フラグ1 (セーブ不要) / Extra monster flags */
+       EnumClassFlagGroup<MonsterTemporaryFlagType> mflag{};   /*!< モンスター個体に与えられた特殊フラグ1 (セーブ不要) / Extra monster flags */
        EnumClassFlagGroup<MFLAG2> mflag2{};    /*!< モンスター個体に与えられた特殊フラグ2 (セーブ必要) / Extra monster flags */
        bool ml{};              /*!< モンスターがプレイヤーにとって視認できるか(処理のためのテンポラリ変数) Monster is "visible" */
        ObjectIndexList hold_o_idx_list{};      /*!< モンスターが所持しているアイテムのリスト / Object list being held (if any) */

diff --git a/src/target/target-preparation.cpp b/src/target/target-preparation.cpp
index 1e9aece..6aa29f9 100644 (file)
--- a/src/target/target-preparation.cpp
+++ b/src/target/target-preparation.cpp
@@ -176,7 +176,7 @@ void target_sensing_monsters_prepare(player_type *player_ptr, std::vector<MONSTE
             continue;
 
         // 感知魔法/スキルやESPで感知していない擬態モンスターはモンスター一覧に表示しない
-        if (is_mimicry(m_ptr) && m_ptr->mflag2.has_none_of({ MFLAG2::MARK, MFLAG2::SHOW }) && m_ptr->mflag.has_not(MFLAG::ESP))
+        if (is_mimicry(m_ptr) && m_ptr->mflag2.has_none_of({ MFLAG2::MARK, MFLAG2::SHOW }) && m_ptr->mflag.has_not(MonsterTemporaryFlagType::ESP))
             continue;
 
         monster_list.push_back(i);