[Refactor] MAX_STORESを constexpr int 置換の上、StoreSaleType::MAX を参照。

diff --git a/src/store/store-owners.cpp b/src/store/store-owners.cpp
index 288202d..945744f 100644 (file)
--- a/src/store/store-owners.cpp
+++ b/src/store/store-owners.cpp
@@ -1,4 +1,5 @@
 #include "store/store-owners.h"
+#include "store/store-util.h"
 #include "player-info/race-types.h"
 
 /*!

diff --git a/src/store/store-owners.h b/src/store/store-owners.h
index 7292133..0e5d884 100644 (file)
--- a/src/store/store-owners.h
+++ b/src/store/store-owners.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "player-info/race-types.h"
+#include "store/store-util.h"
 #include "system/angband.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) */
 
 /*!

diff --git a/src/store/store-util.h b/src/store/store-util.h
index 261ca9a..6d40536 100644 (file)
--- a/src/store/store-util.h
+++ b/src/store/store-util.h
@@ -2,6 +2,7 @@
 
 #include "system/angband.h"
 
+#include "util/enum-converter.h"
 #include "util/enum-range.h"
 
 #include <memory>
@@ -20,8 +21,9 @@ enum class StoreSaleType {
     HOME      = 7, //!< 店舗の種類: 我が家
     BOOK      = 8, //!< 店舗の種類: 書店
     MUSEUM    = 9, //!< 店舗の種類: 博物館
-    MAX       = 10
+    MAX
 };
+constexpr int MAX_STORES = enum2i(StoreSaleType::MAX); /*!< 店舗の種類最大数 / Total number of stores (see "store.c", etc) */
 
 constexpr auto STORE_SALE_TYPE_LIST = EnumRange(StoreSaleType::GENERAL, StoreSaleType::MUSEUM);