[Refactor] #2694 object_value() をget_price() に、object_value_base() をget_baseitem_pric...

diff --git a/src/autopick/autopick-destroyer.cpp b/src/autopick/autopick-destroyer.cpp
index 163af23..979715b 100644 (file)
--- a/src/autopick/autopick-destroyer.cpp
+++ b/src/autopick/autopick-destroyer.cpp
@@ -78,7 +78,7 @@ static bool is_opt_confirm_destroy(PlayerType *player_ptr, ObjectType *o_ptr)
     }
 
     if (leave_worth) {
-        if (o_ptr->object_value() > 0) {
+        if (o_ptr->get_price() > 0) {
             return false;
         }
     }

diff --git a/src/autopick/autopick-matcher.cpp b/src/autopick/autopick-matcher.cpp
index 6cfd22d..8c2bef8 100644 (file)
--- a/src/autopick/autopick-matcher.cpp
+++ b/src/autopick/autopick-matcher.cpp
@@ -89,7 +89,7 @@ bool is_autopick_match(PlayerType *player_ptr, ObjectType *o_ptr, autopick_type
         }
     }
 
-    if (IS_FLG(FLG_WORTHLESS) && (o_ptr->object_value() > 0)) {
+    if (IS_FLG(FLG_WORTHLESS) && (o_ptr->get_price() > 0)) {
         return false;
     }
 

diff --git a/src/cmd-item/cmd-destroy.cpp b/src/cmd-item/cmd-destroy.cpp
index 33e67cb..dbf9913 100644 (file)
--- a/src/cmd-item/cmd-destroy.cpp
+++ b/src/cmd-item/cmd-destroy.cpp
@@ -57,7 +57,7 @@ static destroy_type *initialize_destroy_type(destroy_type *destroy_ptr, ObjectTy
 
 static bool check_destory_item(PlayerType *player_ptr, destroy_type *destroy_ptr)
 {
-    if (destroy_ptr->force || (!confirm_destroy && (destroy_ptr->o_ptr->object_value() <= 0))) {
+    if (destroy_ptr->force || (!confirm_destroy && (destroy_ptr->o_ptr->get_price() <= 0))) {
         return true;
     }
 

diff --git a/src/inventory/inventory-object.cpp b/src/inventory/inventory-object.cpp
index e81ca28..4ed943a 100644 (file)
--- a/src/inventory/inventory-object.cpp
+++ b/src/inventory/inventory-object.cpp
@@ -253,7 +253,7 @@ void reorder_pack(PlayerType *player_ptr)
             continue;
         }
 
-        o_value = o_ptr->object_value();
+        o_value = o_ptr->get_price();
         for (j = 0; j < INVEN_PACK; j++) {
             if (object_sort_comp(player_ptr, o_ptr, o_value, &player_ptr->inventory_list[j])) {
                 break;
@@ -335,7 +335,7 @@ int16_t store_item_to_inventory(PlayerType *player_ptr, ObjectType *o_ptr)
 
     i = j;
     if (i < INVEN_PACK) {
-        const auto o_value = o_ptr->object_value();
+        const auto o_value = o_ptr->get_price();
         for (j = 0; j < INVEN_PACK; j++) {
             if (object_sort_comp(player_ptr, o_ptr, o_value, &player_ptr->inventory_list[j])) {
                 break;

diff --git a/src/load/store-loader.cpp b/src/load/store-loader.cpp
index ad81b92..100f21d 100644 (file)
--- a/src/load/store-loader.cpp
+++ b/src/load/store-loader.cpp
@@ -43,7 +43,7 @@ static void home_carry_load(PlayerType *player_ptr, store_type *store_ptr, Objec
         return;
     }
 
-    const auto value = o_ptr->object_value();
+    const auto value = o_ptr->get_price();
     int slot;
     for (slot = 0; slot < store_ptr->stock_num; slot++) {
         if (object_sort_comp(player_ptr, o_ptr, value, &store_ptr->stock[slot])) {

diff --git a/src/spell-realm/spells-sorcery.cpp b/src/spell-realm/spells-sorcery.cpp
index 5272c1f..599b1e1 100644 (file)
--- a/src/spell-realm/spells-sorcery.cpp
+++ b/src/spell-realm/spells-sorcery.cpp
@@ -51,7 +51,7 @@ bool alchemy(PlayerType *player_ptr)
     o_ptr->number = old_number;
 
     if (!force) {
-        if (confirm_destroy || (o_ptr->object_value() > 0)) {
+        if (confirm_destroy || (o_ptr->get_price() > 0)) {
             char out_val[MAX_NLEN + 40];
             sprintf(out_val, _("本当に%sを金に変えますか？", "Really turn %s to gold? "), o_name);
             if (!get_check(out_val)) {

diff --git a/src/store/home.cpp b/src/store/home.cpp
index 04a199a..f97982a 100644 (file)
--- a/src/store/home.cpp
+++ b/src/store/home.cpp
@@ -67,7 +67,7 @@ int home_carry(PlayerType *player_ptr, ObjectType *o_ptr, StoreSaleType store_nu
         }
     }
 
-    const auto value = o_ptr->object_value();
+    const auto value = o_ptr->get_price();
     int slot;
     for (slot = 0; slot < st_ptr->stock_num; slot++) {
         if (object_sort_comp(player_ptr, o_ptr, value, &st_ptr->stock[slot])) {
@@ -147,7 +147,7 @@ static void exe_reorder_store_item(PlayerType *player_ptr, bool *flag)
             continue;
         }
 
-        const auto o_value = o_ptr->object_value();
+        const auto o_value = o_ptr->get_price();
         int j;
         for (j = 0; j < st_ptr->stock_num; j++) {
             if (object_sort_comp(player_ptr, o_ptr, o_value, &st_ptr->stock[j])) {

diff --git a/src/store/pricing.cpp b/src/store/pricing.cpp
index 70ee5f2..3c258dd 100644 (file)
--- a/src/store/pricing.cpp
+++ b/src/store/pricing.cpp
@@ -33,7 +33,7 @@
  */
 PRICE price_item(PlayerType *player_ptr, ObjectType *o_ptr, int greed, bool flip, StoreSaleType store_num)
 {
-    auto price = o_ptr->object_value();
+    auto price = o_ptr->get_price();
     if (price <= 0) {
         return 0L;
     }

diff --git a/src/store/sell-order.cpp b/src/store/sell-order.cpp
index 5ae4c1a..4a10deb 100644 (file)
--- a/src/store/sell-order.cpp
+++ b/src/store/sell-order.cpp
@@ -153,7 +153,7 @@ void store_sell(PlayerType *player_ptr, StoreSaleType store_num)
 
             player_ptr->au += price;
             store_prt_gold(player_ptr);
-            const auto dummy = q_ptr->object_value() * q_ptr->number;
+            const auto dummy = q_ptr->get_price() * q_ptr->number;
 
             identify_item(player_ptr, o_ptr);
             q_ptr = &forge;
@@ -165,7 +165,7 @@ void store_sell(PlayerType *player_ptr, StoreSaleType store_num)
                 q_ptr->pval = o_ptr->pval * amt / o_ptr->number;
             }
 
-            const auto value = q_ptr->object_value() * q_ptr->number;
+            const auto value = q_ptr->get_price() * q_ptr->number;
             describe_flavor(player_ptr, o_name, q_ptr, 0);
             msg_format(_("%sを $%ldで売却しました。", "You sold %s for %ld gold."), o_name, static_cast<long>(price));
 

diff --git a/src/store/service-checker.cpp b/src/store/service-checker.cpp
index 9d8f6e7..491b552 100644 (file)
--- a/src/store/service-checker.cpp
+++ b/src/store/service-checker.cpp
@@ -225,7 +225,7 @@ bool store_will_buy(PlayerType *, const ObjectType *o_ptr, StoreSaleType store_n
         return false;
     }
 
-    return o_ptr->object_value() > 0;
+    return o_ptr->get_price() > 0;
 }
 
 static int mass_lite_produce(const PRICE cost)
@@ -442,7 +442,7 @@ static byte decide_discount_rate(const PRICE cost)
  */
 void mass_produce(PlayerType *, ObjectType *o_ptr, StoreSaleType store_num)
 {
-    const auto cost = o_ptr->object_value();
+    const auto cost = o_ptr->get_price();
     int size = switch_mass_production(o_ptr, cost, store_num);
     auto discount = decide_discount_rate(cost);
     if (o_ptr->art_name) {

diff --git a/src/store/store-util.cpp b/src/store/store-util.cpp
index 9227c05..3a014a5 100644 (file)
--- a/src/store/store-util.cpp
+++ b/src/store/store-util.cpp
@@ -236,7 +236,7 @@ static void store_object_absorb(ObjectType *o_ptr, ObjectType *j_ptr)
  */
 int store_carry(ObjectType *o_ptr)
 {
-    const auto value = o_ptr->object_value();
+    const auto value = o_ptr->get_price();
     if (value <= 0) {
         return -1;
     }
@@ -282,7 +282,7 @@ int store_carry(ObjectType *o_ptr)
             }
         }
 
-        auto j_value = j_ptr->object_value();
+        auto j_value = j_ptr->get_price();
         if (value > j_value) {
             break;
         }

diff --git a/src/store/store.cpp b/src/store/store.cpp
index 225d3c3..61ad54e 100644 (file)
--- a/src/store/store.cpp
+++ b/src/store/store.cpp
@@ -372,11 +372,11 @@ static void store_create(PlayerType *player_ptr, KIND_OBJECT_IDX fix_k_idx, Stor
         }
 
         if (store_num == StoreSaleType::BLACK) {
-            if (black_market_crap(player_ptr, q_ptr) || (q_ptr->object_value() < 10)) {
+            if (black_market_crap(player_ptr, q_ptr) || (q_ptr->get_price() < 10)) {
                 continue;
             }
         } else {
-            if (q_ptr->object_value() <= 0) {
+            if (q_ptr->get_price() <= 0) {
                 continue;
             }
         }

diff --git a/src/system/object-type-definition.cpp b/src/system/object-type-definition.cpp
index c131ec9..fc9c4d7 100644 (file)
--- a/src/system/object-type-definition.cpp
+++ b/src/system/object-type-definition.cpp
@@ -2,7 +2,7 @@
  * @file object-type-definition.h
  * @brief アイテム定義の構造体とエンティティ処理実装
  * @author Hourier
- * @date 2021/05/02
+ * @date 2022/10/09
  */
 
 #include "system/object-type-definition.h"
@@ -704,7 +704,7 @@ char ObjectType::get_symbol() const
  * @brief オブジェクト価格算出のメインルーチン
  * @return オブジェクトの判明している現価格
  */
-int ObjectType::object_value() const
+int ObjectType::get_price() const
 {
     int value;
     const auto is_worthless = this->is_broken() || this->is_cursed();
@@ -719,7 +719,7 @@ int ObjectType::object_value() const
             return 0;
         }
 
-        value = this->object_value_base();
+        value = this->get_baseitem_price();
     }
 
     if (this->discount) {
@@ -733,7 +733,7 @@ int ObjectType::object_value() const
  * @brief 未鑑定なベースアイテムの基本価格を返す
  * @return オブジェクトの未鑑定価格
  */
-int ObjectType::object_value_base() const
+int ObjectType::get_baseitem_price() const
 {
     if (this->is_aware()) {
         return k_info[this->k_idx].cost;

diff --git a/src/system/object-type-definition.h b/src/system/object-type-definition.h
index c905088..a0ff0fe 100644 (file)
--- a/src/system/object-type-definition.h
+++ b/src/system/object-type-definition.h
@@ -117,10 +117,10 @@ public:
     bool can_pile(const ObjectType *j_ptr) const;
     TERM_COLOR get_color() const;
     char get_symbol() const;
-    int object_value() const;
+    int get_price() const;
 
 private:
-    int object_value_base() const;
+    int get_baseitem_price() const;
     int calc_figurine_value() const;
     int calc_capture_value() const;
 };

diff --git a/src/util/object-sort.cpp b/src/util/object-sort.cpp
index 55a8ede..aa2f4d0 100644 (file)
--- a/src/util/object-sort.cpp
+++ b/src/util/object-sort.cpp
@@ -138,5 +138,5 @@ bool object_sort_comp(PlayerType *player_ptr, ObjectType *o_ptr, int32_t o_value
         break;
     }
 
-    return o_value > j_ptr->object_value();
+    return o_value > j_ptr->get_price();
 }

diff --git a/src/wizard/items-spoiler.cpp b/src/wizard/items-spoiler.cpp
index 7780a1a..80f9e8a 100644 (file)
--- a/src/wizard/items-spoiler.cpp
+++ b/src/wizard/items-spoiler.cpp
@@ -38,7 +38,7 @@ static void kind_info(PlayerType *player_ptr, char *buf, char *dam, char *wgt, c
     q_ptr->to_h = 0;
     q_ptr->to_d = 0;
     *lev = k_info[q_ptr->k_idx].level;
-    *val = q_ptr->object_value();
+    *val = q_ptr->get_price();
     if (!buf || !dam || !chance || !wgt) {
         return;
     }