Merge remote-tracking branch 'remotes/origin/feature/Fix-Blindness-Trap' into develop...

[hengband/hengband.git] / src / artifact / random-art-pval-investor.c

diff --git a/src/artifact/random-art-pval-investor.c b/src/artifact/random-art-pval-investor.c
index 113be3d..2146fe5 100644 (file)
--- a/src/artifact/random-art-pval-investor.c
+++ b/src/artifact/random-art-pval-investor.c
@@ -14,7 +14,7 @@
 
 static bool random_art_bias_strength(object_type *o_ptr)
 {
-    if (have_flag(o_ptr->art_flags, TR_STR))
+    if (has_flag(o_ptr->art_flags, TR_STR))
         return FALSE;
 
     add_flag(o_ptr->art_flags, TR_STR);
@@ -23,7 +23,7 @@ static bool random_art_bias_strength(object_type *o_ptr)
 
 static bool random_art_bias_intelligence(object_type *o_ptr)
 {
-    if (have_flag(o_ptr->art_flags, TR_INT))
+    if (has_flag(o_ptr->art_flags, TR_INT))
         return FALSE;
 
     add_flag(o_ptr->art_flags, TR_INT);
@@ -32,7 +32,7 @@ static bool random_art_bias_intelligence(object_type *o_ptr)
 
 static bool random_art_bias_wisdom(object_type *o_ptr)
 {
-    if (have_flag(o_ptr->art_flags, TR_WIS))
+    if (has_flag(o_ptr->art_flags, TR_WIS))
         return FALSE;
 
     add_flag(o_ptr->art_flags, TR_WIS);
@@ -41,7 +41,7 @@ static bool random_art_bias_wisdom(object_type *o_ptr)
 
 static bool random_art_bias_dexterity(object_type *o_ptr)
 {
-    if (have_flag(o_ptr->art_flags, TR_DEX))
+    if (has_flag(o_ptr->art_flags, TR_DEX))
         return FALSE;
 
     add_flag(o_ptr->art_flags, TR_DEX);
@@ -50,7 +50,7 @@ static bool random_art_bias_dexterity(object_type *o_ptr)
 
 static bool random_art_bias_constitution(object_type *o_ptr)
 {
-    if (have_flag(o_ptr->art_flags, TR_CON))
+    if (has_flag(o_ptr->art_flags, TR_CON))
         return FALSE;
 
     add_flag(o_ptr->art_flags, TR_CON);
@@ -59,7 +59,7 @@ static bool random_art_bias_constitution(object_type *o_ptr)
 
 static bool random_art_bias_charisma(object_type *o_ptr)
 {
-    if (have_flag(o_ptr->art_flags, TR_CHR))
+    if (has_flag(o_ptr->art_flags, TR_CHR))
         return FALSE;
 
     add_flag(o_ptr->art_flags, TR_CHR);
@@ -68,7 +68,7 @@ static bool random_art_bias_charisma(object_type *o_ptr)
 
 static bool random_art_bias_magic_mastery(object_type *o_ptr)
 {
-    if ((o_ptr->tval != TV_GLOVES) || have_flag(o_ptr->art_flags, TR_MAGIC_MASTERY))
+    if ((o_ptr->tval != TV_GLOVES) || has_flag(o_ptr->art_flags, TR_MAGIC_MASTERY))
         return FALSE;
 
     add_flag(o_ptr->art_flags, TR_MAGIC_MASTERY);
@@ -77,7 +77,7 @@ static bool random_art_bias_magic_mastery(object_type *o_ptr)
 
 static bool random_art_bias_stealth(object_type *o_ptr)
 {
-    if (have_flag(o_ptr->art_flags, TR_STEALTH))
+    if (has_flag(o_ptr->art_flags, TR_STEALTH))
         return FALSE;
 
     add_flag(o_ptr->art_flags, TR_STEALTH);
@@ -86,7 +86,7 @@ static bool random_art_bias_stealth(object_type *o_ptr)
 
 static bool random_art_bias_search(object_type *o_ptr)
 {
-    if (have_flag(o_ptr->art_flags, TR_SEARCH))
+    if (has_flag(o_ptr->art_flags, TR_SEARCH))
         return FALSE;
 
     add_flag(o_ptr->art_flags, TR_SEARCH);
@@ -125,7 +125,7 @@ static bool switch_random_art_bias(object_type *o_ptr)
 static bool random_art_bias_decrease_mana(object_type *o_ptr)
 {
     if (((o_ptr->artifact_bias != BIAS_MAGE) && (o_ptr->artifact_bias != BIAS_PRIESTLY)) || (o_ptr->tval != TV_SOFT_ARMOR) || (o_ptr->sval != SV_ROBE)
-        || have_flag(o_ptr->art_flags, TR_DEC_MANA) || !one_in_(3))
+        || has_flag(o_ptr->art_flags, TR_DEC_MANA) || !one_in_(3))
         return FALSE;
 
     add_flag(o_ptr->art_flags, TR_DEC_MANA);