[Refactor] 店舗の種類を enum class StoreSaleType 型に変更しリファクタリング。

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

diff --git a/src/store/store.h b/src/store/store.h
index 51292b4..fcaf50b 100644 (file)
--- a/src/store/store.h
+++ b/src/store/store.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "store/store-owners.h"
 #include "store/store-util.h"
 
  /* Store constants */
@@ -12,20 +11,22 @@
 #define STORE_SHUFFLE   21              /* 1/Chance (per day) of an owner changing */
 #define STORE_TICKS     1000            /* Number of ticks between turnovers */
 
+typedef struct owner_type owner_type;
 extern int store_top;
 extern int store_bottom;
 extern int xtra_stock;
 extern const owner_type *ot_ptr;
-extern s16b old_town_num;
-extern s16b inner_town_num;
+extern int16_t old_town_num;
+extern int16_t inner_town_num;
 
 extern int cur_store_feat;
 extern bool allow_inc;
 
-s16b store_get_stock_max(STORE_TYPE_IDX store_idx, bool powerup = true);
-void store_shuffle(player_type *player_ptr, int which);
-void store_maintenance(player_type *player_ptr, int town_num, int store_num, int chance);
-void store_init(int town_num, int store_num);
+struct player_type;
+int16_t store_get_stock_max(StoreSaleType sst, bool powerup = true);
+void store_shuffle(player_type *player_ptr, StoreSaleType which);
+void store_maintenance(player_type *player_ptr, int town_num, StoreSaleType store_num, int chance);
+void store_init(int town_num, StoreSaleType store_num);
 void store_examine(player_type *player_ptr);
 int store_check_num(object_type *o_ptr);
 int get_stock(COMMAND_CODE *com_val, concptr pmt, int i, int j);