[Refactor]定数を再定義したものに置換

diff --git a/src/core/player-processor.cpp b/src/core/player-processor.cpp
index 7d2f729..f685640 100644 (file)
--- a/src/core/player-processor.cpp
+++ b/src/core/player-processor.cpp
@@ -1,4 +1,4 @@
-#include "core/player-processor.h"
+#include "core/player-processor.h"
 #include "action/run-execution.h"
 #include "action/travel-execution.h"
 #include "core/disturbance.h"
@@ -339,7 +339,7 @@ void process_player(PlayerType *player_ptr)
                 r_ptr = &r_info[m_ptr->ap_r_idx];
 
                 // モンスターのシンボル/カラーの更新
-                if (m_ptr->ml && any_bits(r_ptr->flags1, (RF1_ATTR_MULTI | RF1_SHAPECHANGER))) {
+                if (m_ptr->ml && r_ptr->visual_flags.has_any_of({ MonsterVisualType::MULTI_COLOR, MonsterVisualType::SHAPECHANGER })) {
                     lite_spot(player_ptr, m_ptr->fy, m_ptr->fx);
                 }
 

diff --git a/src/monster-race/race-visual-flags.h b/src/monster-race/race-visual-flags.h
index 92849d7..7714972 100644 (file)
--- a/src/monster-race/race-visual-flags.h
+++ b/src/monster-race/race-visual-flags.h
@@ -4,7 +4,7 @@ enum class MonsterVisualType {
     CLEAR = 0,
     SHAPECHANGER = 1,
     CLEAR_COLOR = 2,
-    MULTI_COLOR_7 = 3,
+    MULTI_COLOR = 3,
     RANDOM_COLOR = 4,
     ANY_COLOR = 5,
     MAX,

diff --git a/src/view/display-map.cpp b/src/view/display-map.cpp
index 1af8a73..44dd213 100644 (file)
--- a/src/view/display-map.cpp
+++ b/src/view/display-map.cpp
@@ -1,4 +1,4 @@
-#include "view/display-map.h"
+#include "view/display-map.h"
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick-methods-table.h"
 #include "autopick/autopick-util.h"
@@ -291,7 +291,7 @@ void map_info(PlayerType *player_ptr, POSITION y, POSITION x, TERM_COLOR *ap, SY
     monster_race *r_ptr = &r_info[m_ptr->ap_r_idx];
     feat_priority = 30;
     if (player_ptr->hallucinated) {
-        if ((r_ptr->flags1 & (RF1_CHAR_CLEAR | RF1_ATTR_CLEAR)) == (RF1_CHAR_CLEAR | RF1_ATTR_CLEAR)) {
+        if (r_ptr->visual_flags.has_all_of({ MonsterVisualType::CLEAR, MonsterVisualType::CLEAR_COLOR })) {
             /* Do nothing */
         } else {
             image_monster(ap, cp);
@@ -303,22 +303,22 @@ void map_info(PlayerType *player_ptr, POSITION y, POSITION x, TERM_COLOR *ap, SY
 
     a = r_ptr->x_attr;
     c = r_ptr->x_char;
-    if (!(r_ptr->flags1 & (RF1_CHAR_CLEAR | RF1_SHAPECHANGER | RF1_ATTR_CLEAR | RF1_ATTR_MULTI | RF1_ATTR_SEMIRAND))) {
+    if (r_ptr->visual_flags.has_none_of({ MonsterVisualType::CLEAR, MonsterVisualType::SHAPECHANGER, MonsterVisualType::CLEAR_COLOR, MonsterVisualType::MULTI_COLOR, MonsterVisualType::RANDOM_COLOR })) {
         *ap = a;
         *cp = c;
         set_term_color(player_ptr, y, x, ap, cp);
         return;
     }
 
-    if ((r_ptr->flags1 & (RF1_CHAR_CLEAR | RF1_ATTR_CLEAR)) == (RF1_CHAR_CLEAR | RF1_ATTR_CLEAR)) {
+    if (r_ptr->visual_flags.has_all_of({ MonsterVisualType::CLEAR, MonsterVisualType::CLEAR_COLOR })) {
         set_term_color(player_ptr, y, x, ap, cp);
         return;
     }
 
-    if ((r_ptr->flags1 & RF1_ATTR_CLEAR) && (*ap != TERM_DARK) && !use_graphics) {
+    if (r_ptr->visual_flags.has(MonsterVisualType::CLEAR_COLOR) && (*ap != TERM_DARK) && !use_graphics) {
         /* Do nothing */
-    } else if ((r_ptr->flags1 & RF1_ATTR_MULTI) && !use_graphics) {
-        if (r_ptr->flags2 & RF2_ATTR_ANY)
+    } else if (r_ptr->visual_flags.has(MonsterVisualType::MULTI_COLOR) && !use_graphics) {
+        if (r_ptr->visual_flags.has(MonsterVisualType::ANY_COLOR))
             *ap = randint1(15);
         else
             switch (randint1(7)) {
@@ -344,18 +344,18 @@ void map_info(PlayerType *player_ptr, POSITION y, POSITION x, TERM_COLOR *ap, SY
                 *ap = TERM_GREEN;
                 break;
             }
-    } else if ((r_ptr->flags1 & RF1_ATTR_SEMIRAND) && !use_graphics) {
+    } else if (r_ptr->visual_flags.has(MonsterVisualType::RANDOM_COLOR) && !use_graphics) {
         *ap = g_ptr->m_idx % 15 + 1;
     } else {
         *ap = a;
     }
 
-    if ((r_ptr->flags1 & RF1_CHAR_CLEAR) && (*cp != ' ') && !use_graphics) {
+    if (r_ptr->visual_flags.has(MonsterVisualType::CLEAR) && (*cp != ' ') && !use_graphics) {
         set_term_color(player_ptr, y, x, ap, cp);
         return;
     }
 
-    if (r_ptr->flags1 & RF1_SHAPECHANGER) {
+    if (r_ptr->visual_flags.has(MonsterVisualType::SHAPECHANGER)) {
         if (use_graphics) {
             monster_race *tmp_r_ptr = &r_info[randint1(r_info.size() - 1)];
             *cp = tmp_r_ptr->x_char;

diff --git a/src/wizard/monster-info-spoiler.cpp b/src/wizard/monster-info-spoiler.cpp
index 6d2d324..685696e 100644 (file)
--- a/src/wizard/monster-info-spoiler.cpp
+++ b/src/wizard/monster-info-spoiler.cpp
@@ -22,15 +22,15 @@
  */
 static concptr attr_to_text(monster_race *r_ptr)
 {
-    if (any_bits(r_ptr->flags1, RF1_ATTR_CLEAR)) {
+    if (r_ptr->visual_flags.has(MonsterVisualType::CLEAR_COLOR)) {
         return _("透明な", "Clear");
     }
 
-    if (any_bits(r_ptr->flags1, RF1_ATTR_MULTI)) {
+    if (r_ptr->visual_flags.has(MonsterVisualType::MULTI_COLOR)) {
         return _("万色の", "Multi");
     }
 
-    if (any_bits(r_ptr->flags1, RF1_ATTR_SEMIRAND)) {
+    if (r_ptr->visual_flags.has(MonsterVisualType::RANDOM_COLOR)) {
         return _("準ランダムな", "S.Rand");
     }