Merge pull request #3297 from Hourier/Move-Update-Flags-3

[hengbandforosx/hengbandosx.git] / src / store / store-owners.h

diff --git a/src/store/store-owners.h b/src/store/store-owners.h
index 46a7506..1566671 100644 (file)
--- a/src/store/store-owners.h
+++ b/src/store/store-owners.h
@@ -1,20 +1,20 @@
 #pragma once
 
+#include "player-info/race-types.h"
+#include "store/store-util.h"
 #include "system/angband.h"
-#include "player/player-race-types.h"
-#include <array>
-
-#define MAX_STORES      10 /*!< 店舗の種類最大数 / Total number of stores (see "store.c", etc) */
-#define MAX_OWNERS      32 /*!< 各店舗毎の店主定義最大数 / Total number of owners per store (see "store.c", etc) */
+#include <unordered_map>
+#include <vector>
 
 /*!
  * @brief 店主データ構造体
  */
 struct owner_type {
-       concptr owner_name;     //!< 名前 / Name
-       PRICE max_cost; //!< 買取上限 / Purse limit
-       byte inflate; //!< 価格上乗せ率 / Inflation
-       player_race_type owner_race; //!< 店主種族 / Owner race
+    concptr owner_name; //!< 名前 / Name
+    PRICE max_cost; //!< 買取上限 / Purse limit
+    byte inflate; //!< 価格上乗せ率 / Inflation
+    PlayerRaceType owner_race; //!< 店主種族 / Owner race
+    DEPTH level{}; //!< Production Level
 };
 
-extern const owner_type owners[MAX_STORES][MAX_OWNERS];
+extern const std::unordered_map<StoreSaleType, std::vector<owner_type>> owners;