[Refactor] #1766 Changed ItemPrimaryType from enum to enum class

[hengbandforosx/hengbandosx.git] / src / object-enchant / object-smith.cpp

diff --git a/src/object-enchant/object-smith.cpp b/src/object-enchant/object-smith.cpp
index ec5c162..b917c34 100644 (file)
--- a/src/object-enchant/object-smith.cpp
+++ b/src/object-enchant/object-smith.cpp
@@ -168,7 +168,7 @@ int Smith::get_essence_consumption(SmithEffect effect, const object_type *o_ptr)
         return consumption;
     }
 
-    if ((o_ptr->tval >= TV_SHOT) && (o_ptr->tval <= TV_BOLT)) {
+    if ((o_ptr->tval >= ItemPrimaryType::TV_SHOT) && (o_ptr->tval <= ItemPrimaryType::TV_BOLT)) {
         consumption = (consumption + 9) / 10;
     }
 
@@ -187,7 +187,7 @@ std::unique_ptr<ItemTester> Smith::get_item_tester(SmithEffect effect)
 {
     auto info = find_smith_info(effect);
     if (!info.has_value()) {
-        return std::make_unique<TvalItemTester>(TV_NONE);
+        return std::make_unique<TvalItemTester>(ItemPrimaryType::TV_NONE);
     }
 
     auto tester_func = [i = info.value()](const object_type *o_ptr) {
@@ -349,7 +349,7 @@ Smith::DrainEssenceResult Smith::drain_essence(object_type *o_ptr)
     o_ptr->number = old_o.number;
     o_ptr->discount = old_o.discount;
 
-    if (o_ptr->tval == TV_DRAG_ARMOR)
+    if (o_ptr->tval == ItemPrimaryType::TV_DRAG_ARMOR)
         o_ptr->timeout = old_o.timeout;
     o_ptr->ident |= (IDENT_FULL_KNOWN);
     object_aware(player_ptr, o_ptr);