[Refactor] #37353 define.h の店舗実装要素を store.h へ移動。 / Move some store implement in defin...

diff --git a/src/defines.h b/src/defines.h
index ab570da..1c67b68 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -145,7 +145,6 @@
 #define BUILDING_MEMBER     1 /*!< 不明(現在未使用) */
 #define BUILDING_OWNER      2 /*!< 施設の種族/職業条件が一致している状態値 */
 
-#define MAX_OWNERS      32 /*!< 各店舗毎の店主定義最大数 / Total number of owners per store (see "store.c", etc) */
 #define MAX_SEXES        2 /*!< 性別の定義最大数 / Maximum number of player "sex" types (see "table.c", etc) */
 #define MAX_CLASS       28 /*!< 職業の最大定義数 Maximum number of player "class" types (see "table.c", etc) */
 #define MAX_SEIKAKU     13 /*!< 性格の最大定義数 */
@@ -302,18 +301,6 @@
 #define SPECIAL_KEY_STORE    253
 #define SPECIAL_KEY_QUIT     252
 
-/*
- * Store constants
- */
-#define STORE_INVEN_MAX 24              /* Max number of discrete objs in inven */
-#define STORE_CHOICES   48              /* Number of items to choose stock from */
-#define STORE_OBJ_LEVEL 5               /* Magic Level for normal stores */
-#define STORE_TURNOVER  9               /* Normal shop turnover, per day */
-#define STORE_MIN_KEEP  6               /* Min slots to "always" keep full */
-#define STORE_MAX_KEEP  18              /* Max slots to "always" keep full */
-#define STORE_SHUFFLE   21              /* 1/Chance (per day) of an owner changing */
-#define STORE_TICKS     1000            /* Number of ticks between turnovers */
-
 /*! @brief 消費する行動エネルギー値を正規乱数で返す(中央100/分散25) / Random energy */
 #define ENERGY_NEED() (randnor(100, 25))
 

diff --git a/src/store.h b/src/store.h
index 7c4db34..6ae8fa3 100644 (file)
--- a/src/store.h
+++ b/src/store.h
@@ -12,7 +12,21 @@
 #define STORE_HOME      7 /*!< \93X\95Ü\82Ì\8eí\97Þ: \89ä\82ª\89Æ */\r
 #define STORE_BOOK      8 /*!< \93X\95Ü\82Ì\8eí\97Þ: \8f\91\93X */\r
 #define STORE_MUSEUM    9 /*!< \93X\95Ü\82Ì\8eí\97Þ: \94\8e\95¨\8aÙ */\r
-#define MAX_STORES 10 /*!< store.c\97p\82Ì\93X\95Ü\82Ì\8eí\97Þ\8dÅ\91å\90\94 / Total number of stores (see "store.c", etc) */\r
+#define MAX_STORES      10 /*!< store.c\97p\82Ì\93X\95Ü\82Ì\8eí\97Þ\8dÅ\91å\90\94 / Total number of stores (see "store.c", etc) */\r
+\r
+#define MAX_OWNERS      32 /*!< \8ae\93X\95Ü\96\88\82Ì\93X\8eå\92è\8b`\8dÅ\91å\90\94 / Total number of owners per store (see "store.c", etc) */\r
+\r
+ /*\r
+  * Store constants\r
+  */\r
+#define STORE_INVEN_MAX 24              /* Max number of discrete objs in inven */\r
+#define STORE_CHOICES   48              /* Number of items to choose stock from */\r
+#define STORE_OBJ_LEVEL 5               /* Magic Level for normal stores */\r
+#define STORE_TURNOVER  9               /* Normal shop turnover, per day */\r
+#define STORE_MIN_KEEP  6               /* Min slots to "always" keep full */\r
+#define STORE_MAX_KEEP  18              /* Max slots to "always" keep full */\r
+#define STORE_SHUFFLE   21              /* 1/Chance (per day) of an owner changing */\r
+#define STORE_TICKS     1000            /* Number of ticks between turnovers */\r
 \r
 /* store.c */\r
 extern bool combine_and_reorder_home(int store_num);\r