[Refactor] #41156 Conflict 対策に have_flag() を has_flag() へ / Rename have_flag() to...

[hengband/hengband.git] / src / object / object-info.c

diff --git a/src/object/object-info.c b/src/object/object-info.c
index 5623422..74bbff4 100644 (file)
--- a/src/object/object-info.c
+++ b/src/object/object-info.c
@@ -14,7 +14,6 @@
 #include "artifact/artifact-info.h"
 #include "art-definition/art-weapon-types.h"
 #include "art-definition/random-art-effects.h"
-#include "floor/floor.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race.h"
 #include "object-enchant/activation-info-table.h"
@@ -26,6 +25,7 @@
 #include "realm/realm-names-table.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-ring-types.h"
+#include "system/floor-type-definition.h"
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"
 #include "util/int-char-converter.h"
@@ -45,7 +45,7 @@ static concptr item_activation_dragon_breath(player_type *owner_ptr, object_type
     strcpy(desc, _("", "breath "));
 
     for (int i = 0; dragonbreath_info[i].flag != 0; i++) {
-        if (have_flag(flgs, dragonbreath_info[i].flag)) {
+        if (has_flag(flgs, dragonbreath_info[i].flag)) {
             if (n > 0)
                 strcat(desc, _("、", ", "));
 
@@ -158,7 +158,7 @@ concptr activation_explanation(player_type *owner_ptr, object_type *o_ptr)
 {
     BIT_FLAGS flgs[TR_FLAG_SIZE];
     object_flags(owner_ptr, o_ptr, flgs);
-    if (!(have_flag(flgs, TR_ACTIVATE)))
+    if (!(has_flag(flgs, TR_ACTIVATE)))
         return (_("なし", "nothing"));
 
     if (activation_index(owner_ptr, o_ptr)) {