[Refactor] #2124 Changed struct object_type to class ObjectType

[hengbandforosx/hengbandosx.git] / src / artifact / random-art-slay.cpp

diff --git a/src/artifact/random-art-slay.cpp b/src/artifact/random-art-slay.cpp
index cae8ff0..4e5e0a9 100644 (file)
--- a/src/artifact/random-art-slay.cpp
+++ b/src/artifact/random-art-slay.cpp
@@ -10,7 +10,7 @@
 #include "system/object-type-definition.h"
 #include "util/bit-flags-calculator.h"
 
-static bool random_art_slay_bow(object_type *o_ptr)
+static bool random_art_slay_bow(ObjectType *o_ptr)
 {
     if (o_ptr->tval != ItemKindType::BOW)
         return false;
@@ -39,7 +39,7 @@ static bool random_art_slay_bow(object_type *o_ptr)
     }
 }
 
-static bool random_art_slay_chaos(object_type *o_ptr)
+static bool random_art_slay_chaos(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_CHAOTIC))
         return false;
@@ -48,7 +48,7 @@ static bool random_art_slay_chaos(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool random_art_brand_magical(object_type *o_ptr)
+static bool random_art_brand_magical(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_BRAND_MAGIC))
         return false;
@@ -57,7 +57,7 @@ static bool random_art_brand_magical(object_type *o_ptr)
     return one_in_(3);
 }
 
-static bool random_art_slay_vampiric(object_type *o_ptr)
+static bool random_art_slay_vampiric(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_VAMPIRIC))
         return false;
@@ -66,7 +66,7 @@ static bool random_art_slay_vampiric(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool random_art_slay_brand_acid(object_type *o_ptr)
+static bool random_art_slay_brand_acid(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_BRAND_ACID))
         return false;
@@ -75,7 +75,7 @@ static bool random_art_slay_brand_acid(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool random_art_slay_brand_elec(object_type *o_ptr)
+static bool random_art_slay_brand_elec(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_BRAND_ELEC))
         return false;
@@ -84,7 +84,7 @@ static bool random_art_slay_brand_elec(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool random_art_slay_brand_fire(object_type *o_ptr)
+static bool random_art_slay_brand_fire(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_BRAND_FIRE))
         return false;
@@ -93,7 +93,7 @@ static bool random_art_slay_brand_fire(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool random_art_slay_brand_cold(object_type *o_ptr)
+static bool random_art_slay_brand_cold(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_BRAND_COLD))
         return false;
@@ -102,7 +102,7 @@ static bool random_art_slay_brand_cold(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool random_art_slay_brand_pois(object_type *o_ptr)
+static bool random_art_slay_brand_pois(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_BRAND_POIS) || one_in_(2))
         return false;
@@ -111,7 +111,7 @@ static bool random_art_slay_brand_pois(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool random_art_slay_animal(object_type *o_ptr)
+static bool random_art_slay_animal(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_SLAY_ANIMAL))
         return false;
@@ -120,7 +120,7 @@ static bool random_art_slay_animal(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool random_art_slay_evil(object_type *o_ptr)
+static bool random_art_slay_evil(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_SLAY_EVIL))
         return false;
@@ -129,7 +129,7 @@ static bool random_art_slay_evil(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool random_art_slay_undead(object_type *o_ptr)
+static bool random_art_slay_undead(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_SLAY_UNDEAD))
         return false;
@@ -138,7 +138,7 @@ static bool random_art_slay_undead(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool random_art_slay_demon(object_type *o_ptr)
+static bool random_art_slay_demon(ObjectType *o_ptr)
 {
     if (o_ptr->art_flags.has(TR_SLAY_DEMON))
         return false;
@@ -147,7 +147,7 @@ static bool random_art_slay_demon(object_type *o_ptr)
     return one_in_(2);
 }
 
-static bool switch_random_art_slay(object_type *o_ptr)
+static bool switch_random_art_slay(ObjectType *o_ptr)
 {
     switch (o_ptr->artifact_bias) {
     case BIAS_CHAOS:
@@ -197,7 +197,7 @@ static bool switch_random_art_slay(object_type *o_ptr)
  * @attention オブジェクトのtval、svalに依存したハードコーディング処理がある。
  * @param o_ptr 対象のオブジェクト構造体ポインタ
  */
-void random_slay(object_type *o_ptr)
+void random_slay(ObjectType *o_ptr)
 {
     if (random_art_slay_bow(o_ptr) || switch_random_art_slay(o_ptr))
         return;