[Refactor] #2620 type_value とsubtype_value のアクセシビリティをprivateに変更した

diff --git a/src/market/building-initializer.cpp b/src/market/building-initializer.cpp
index 7b424ef..d5c8931 100644 (file)
--- a/src/market/building-initializer.cpp
+++ b/src/market/building-initializer.cpp
@@ -34,13 +34,13 @@ void init_towns(void)
                 continue;
             }
 
-            for (const auto &kind : store_regular_sale_table.at(sst)) {
-                auto k_idx = lookup_kind(kind.type_value, kind.subtype_value);
+            for (const auto &baseitem : store_regular_sale_table.at(sst)) {
+                auto k_idx = lookup_kind(baseitem);
                 store_ptr->regular.push_back(k_idx);
             }
 
-            for (const auto &kind : store_sale_table.at(sst)) {
-                auto k_idx = lookup_kind(kind.type_value, kind.subtype_value);
+            for (const auto &baseitem : store_sale_table.at(sst)) {
+                auto k_idx = lookup_kind(baseitem);
                 store_ptr->table.push_back(k_idx);
             }
         }

diff --git a/src/object/object-kind-hook.cpp b/src/object/object-kind-hook.cpp
index 5960913..cd59c97 100644 (file)
--- a/src/object/object-kind-hook.cpp
+++ b/src/object/object-kind-hook.cpp
@@ -218,6 +218,11 @@ static const std::vector<const BaseItemInfo *> &get_sorted_baseitems()
     return sorted_cache;
 }
 
+short lookup_kind(const BaseitemKey &key)
+{
+    return lookup_kind(key.tval(), key.sval());
+}
+
 /*!
  * @brief tvalとsvalに対応するベースアイテムのIDを検索する
  * Find the index of the BaseItemInfo with the given tval and sval

diff --git a/src/object/object-kind-hook.h b/src/object/object-kind-hook.h
index 413107a..293e8e7 100644 (file)
--- a/src/object/object-kind-hook.h
+++ b/src/object/object-kind-hook.h
@@ -15,4 +15,6 @@ bool kind_is_boots(KIND_OBJECT_IDX k_idx);
 bool kind_is_amulet(KIND_OBJECT_IDX k_idx);
 bool kind_is_good(KIND_OBJECT_IDX k_idx);
 
+class BaseitemKey;
+short lookup_kind(const BaseitemKey &key); // @details 作業用ラッパーメソッド、今後は下のメソッドではなくこちらに寄せる.
 KIND_OBJECT_IDX lookup_kind(ItemKindType tval, OBJECT_SUBTYPE_VALUE sval);

diff --git a/src/system/baseitem-info-definition.h b/src/system/baseitem-info-definition.h
index ba241ae..ac5d206 100644 (file)
--- a/src/system/baseitem-info-definition.h
+++ b/src/system/baseitem-info-definition.h
@@ -37,14 +37,9 @@ public:
     ItemKindType tval() const;
     int sval() const;
 
-    /*
-     * @todo アクセシビリティによるコンパイルエラーを避けるための一時的措置.
-     * @details svalは後でoptionalにする.
-     */
-    ItemKindType type_value;
-    int subtype_value;
-
 private:
+    ItemKindType type_value;
+    int subtype_value; // @todo optionalにする.
 };
 
 enum class ItemKindType : short;