[Refactor] #2620 Renamed store_stock_item_type to BaseitemKey

diff --git a/src/store/articles-on-sale.cpp b/src/store/articles-on-sale.cpp
index 310a4f6..d1932cc 100644 (file)
--- a/src/store/articles-on-sale.cpp
+++ b/src/store/articles-on-sale.cpp
@@ -23,7 +23,7 @@
  * 17エントリーまで設定可能。(最後はTV_NONE で止める)
  * 種類が多すぎる場合、店舗を埋めつくすので注意。
  */
-const std::map<StoreSaleType, std::vector<store_stock_item_type>> store_regular_sale_table = {
+const std::map<StoreSaleType, std::vector<BaseitemKey>> store_regular_sale_table = {
     { StoreSaleType::GENERAL,
         {
             { ItemKindType::FOOD, SV_FOOD_RATION },
@@ -98,7 +98,7 @@ const std::map<StoreSaleType, std::vector<store_stock_item_type>> store_regular_
  * @brief 店舗でランダム販売するオブジェクトを定義する
  * @details tval/svalのペア
  */
-const std::map<StoreSaleType, std::vector<store_stock_item_type>> store_sale_table = {
+const std::map<StoreSaleType, std::vector<BaseitemKey>> store_sale_table = {
     { StoreSaleType::GENERAL,
         {
             /* General Store */

diff --git a/src/store/articles-on-sale.h b/src/store/articles-on-sale.h
index 8320f07..ee3db66 100644 (file)
--- a/src/store/articles-on-sale.h
+++ b/src/store/articles-on-sale.h
@@ -6,10 +6,10 @@
 #include "system/angband.h"
 #include <map>
 
-struct store_stock_item_type {
+struct BaseitemKey {
     ItemKindType tval;
     OBJECT_SUBTYPE_VALUE sval;
 };
 
-extern const std::map<StoreSaleType, std::vector<store_stock_item_type>> store_regular_sale_table;
-extern const std::map<StoreSaleType, std::vector<store_stock_item_type>> store_sale_table;
+extern const std::map<StoreSaleType, std::vector<BaseitemKey>> store_regular_sale_table;
+extern const std::map<StoreSaleType, std::vector<BaseitemKey>> store_sale_table;