[Refactor] have_pval_flags() を has_pval_flags() に改名. / Rename have_pval_flags() to...

diff --git a/src/cmd-item/cmd-smith.c b/src/cmd-item/cmd-smith.c
index d88fe32..adccee4 100644 (file)
--- a/src/cmd-item/cmd-smith.c
+++ b/src/cmd-item/cmd-smith.c
@@ -1028,7 +1028,7 @@ static void erase_essence(player_type *creature_ptr)
     }
     o_ptr->xtra3 = 0;
     object_flags(creature_ptr, o_ptr, flgs);
-    if (!(have_pval_flags(flgs)))
+    if (!(has_pval_flags(flgs)))
         o_ptr->pval = 0;
     msg_print(_("エッセンスを取り去った。", "You removed all essence you have added."));
     creature_ptr->update |= (PU_COMBINE | PU_REORDER);

diff --git a/src/flavor/flavor-describer.c b/src/flavor/flavor-describer.c
index e3be472..246b510 100644 (file)
--- a/src/flavor/flavor-describer.c
+++ b/src/flavor/flavor-describer.c
@@ -385,7 +385,7 @@ static void describe_specific_pval(flavor_type *flavor_ptr)
 
 static void describe_pval(flavor_type *flavor_ptr)
 {
-    if (!have_pval_flags(flavor_ptr->tr_flags))
+    if (!has_pval_flags(flavor_ptr->tr_flags))
         return;
 
     flavor_ptr->t = object_desc_chr(flavor_ptr->t, ' ');

diff --git a/src/util/bit-flags-calculator.h b/src/util/bit-flags-calculator.h
index 8ba4d78..8705d6e 100644 (file)
--- a/src/util/bit-flags-calculator.h
+++ b/src/util/bit-flags-calculator.h
@@ -4,4 +4,4 @@
 #define add_flag(ARRAY, INDEX) ((ARRAY)[(INDEX) / 32] |= (1L << ((INDEX) % 32)))
 #define remove_flag(ARRAY, INDEX) ((ARRAY)[(INDEX) / 32] &= ~(1L << ((INDEX) % 32)))
 #define is_pval_flag(INDEX) ((TR_STR <= (INDEX) && (INDEX) <= TR_MAGIC_MASTERY) || (TR_STEALTH <= (INDEX) && (INDEX) <= TR_BLOWS))
-#define have_pval_flags(ARRAY) !!((ARRAY)[0] & (0x00003f7f))
+#define has_pval_flags(ARRAY) !!((ARRAY)[0] & (0x00003f7f))