[Refactor] #37353 have_dark_flag() と have_lite_flag() を HAVE_DARK_FLAG() と HAVE_LITE_...

diff --git a/src/defines.h b/src/defines.h
index cfc8ca4..5623249 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -140,11 +140,3 @@
 #else
 #define _(JAPANESE,ENGLISH) (ENGLISH)
 #endif
-
-/* Lite flag macro */
-#define have_lite_flag(ARRAY) \
-       (have_flag(ARRAY, TR_LITE_1) || have_flag(ARRAY, TR_LITE_2) || have_flag(ARRAY, TR_LITE_3))
-
-#define have_dark_flag(ARRAY) \
-       (have_flag(ARRAY, TR_LITE_M1) || have_flag(ARRAY, TR_LITE_M2) || have_flag(ARRAY, TR_LITE_M3))
-

diff --git a/src/files.c b/src/files.c
index 6967c5e..220ed2b 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -3094,12 +3094,12 @@ static void display_flag_aux(TERM_LEN row, TERM_LEN col, concptr header,
                }
                else if (flag1 == TR_LITE_1)
                {
-                       if (have_dark_flag(flgs))
+                       if (HAVE_DARK_FLAG(flgs))
                        {
                                c_put_str(TERM_L_DARK, "+", row, col);
                                header_color = TERM_WHITE;
                        }
-                       else if (have_lite_flag(flgs))
+                       else if (HAVE_LITE_FLAG(flgs))
                        {
                                c_put_str(TERM_WHITE, "+", row, col);
                                header_color = TERM_WHITE;

diff --git a/src/object-flavor.c b/src/object-flavor.c
index 77db5be..508faad 100644 (file)
--- a/src/object-flavor.c
+++ b/src/object-flavor.c
@@ -1089,13 +1089,13 @@ static char *get_ability_abbreviation(char *ptr, object_type *o_ptr, bool kanji,
        }
 
        /* Remove lite flags when this is a dark lite object */
-       if (have_dark_flag(flgs))
+       if (HAVE_DARK_FLAG(flgs))
        {
                if (have_flag(flgs, TR_LITE_1)) remove_flag(flgs, TR_LITE_1);
                if (have_flag(flgs, TR_LITE_2)) remove_flag(flgs, TR_LITE_2);
                if (have_flag(flgs, TR_LITE_3)) remove_flag(flgs, TR_LITE_3);
        }
-       else if (have_lite_flag(flgs))
+       else if (HAVE_LITE_FLAG(flgs))
        {
                add_flag(flgs, TR_LITE_1);
                if (have_flag(flgs, TR_LITE_2)) remove_flag(flgs, TR_LITE_2);

diff --git a/src/object.h b/src/object.h
index 6846202..0eb74b8 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -178,6 +178,13 @@
 #define OBJ_GOLD_LIST   480     /* First "gold" entry */
 #define MAX_GOLD        18      /* Number of "gold" entries */
 
+/* Lite flag macro */
+#define HAVE_LITE_FLAG(ARRAY) \
+       (have_flag(ARRAY, TR_LITE_1) || have_flag(ARRAY, TR_LITE_2) || have_flag(ARRAY, TR_LITE_3))
+
+#define HAVE_DARK_FLAG(ARRAY) \
+       (have_flag(ARRAY, TR_LITE_M1) || have_flag(ARRAY, TR_LITE_M2) || have_flag(ARRAY, TR_LITE_M3))
+
 typedef struct object_type object_type;
 
 struct object_type