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

[hengband/hengband.git] / src / cmd-item / cmd-throw.c

diff --git a/src/cmd-item/cmd-throw.c b/src/cmd-item/cmd-throw.c
index b5549df..90f8a6f 100644 (file)
--- a/src/cmd-item/cmd-throw.c
+++ b/src/cmd-item/cmd-throw.c
@@ -144,7 +144,7 @@ static void calc_throw_range(player_type *creature_ptr, it_type *it_ptr)
 
     int mul = 10 + 2 * (it_ptr->mult - 1);
     int div = ((it_ptr->q_ptr->weight > 10) ? it_ptr->q_ptr->weight : 10);
-    if ((have_flag(it_ptr->obj_flags, TR_THROW)) || it_ptr->boomerang)
+    if ((has_flag(it_ptr->obj_flags, TR_THROW)) || it_ptr->boomerang)
         div /= 2;
 
     it_ptr->tdis = (adj_str_blow[creature_ptr->stat_ind[A_STR]] + 20) * mul / div;
@@ -204,12 +204,12 @@ static void set_class_specific_throw_params(player_type *creature_ptr, it_type *
     it_ptr->x = creature_ptr->x;
     handle_stuff(creature_ptr);
     it_ptr->shuriken = (creature_ptr->pclass == CLASS_NINJA)
-        && ((it_ptr->q_ptr->tval == TV_SPIKE) || ((have_flag(it_ptr->obj_flags, TR_THROW)) && (it_ptr->q_ptr->tval == TV_SWORD)));
+        && ((it_ptr->q_ptr->tval == TV_SPIKE) || ((has_flag(it_ptr->obj_flags, TR_THROW)) && (it_ptr->q_ptr->tval == TV_SWORD)));
 }
 
 static void set_racial_chance(player_type *creature_ptr, it_type *it_ptr)
 {
-    if (have_flag(it_ptr->obj_flags, TR_THROW))
+    if (has_flag(it_ptr->obj_flags, TR_THROW))
         it_ptr->chance = ((creature_ptr->skill_tht) + ((creature_ptr->to_h_b + it_ptr->q_ptr->to_h) * BTH_PLUS_ADJ));
     else
         it_ptr->chance = (creature_ptr->skill_tht + (creature_ptr->to_h_b * BTH_PLUS_ADJ));
@@ -292,7 +292,7 @@ static void calc_racial_power_damage(player_type *creature_ptr, it_type *it_ptr)
     if (it_ptr->boomerang) {
         it_ptr->tdam *= (it_ptr->mult + creature_ptr->num_blow[it_ptr->item - INVEN_RARM]);
         it_ptr->tdam += creature_ptr->to_d_m;
-    } else if (have_flag(it_ptr->obj_flags, TR_THROW)) {
+    } else if (has_flag(it_ptr->obj_flags, TR_THROW)) {
         it_ptr->tdam *= (3 + it_ptr->mult);
         it_ptr->tdam += creature_ptr->to_d_m;
     } else {