[Refactor] #37353 店処理のヘッダを externs.h から store.h へ分離。

Separate externs.h to store.h.

diff --git a/Hengband_vcs2015/Hengband/Hengband.vcxproj b/Hengband_vcs2015/Hengband/Hengband.vcxproj
index ce8409b..09b2ded 100644 (file)
--- a/Hengband_vcs2015/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2015/Hengband/Hengband.vcxproj
@@ -304,6 +304,7 @@
     <ClInclude Include="..\..\src\selfinfo.h" />\r
     <ClInclude Include="..\..\src\spells-summon.h" />\r
     <ClInclude Include="..\..\src\floor-streams.h" />\r
+    <ClInclude Include="..\..\src\store.h" />\r
     <ClInclude Include="..\..\src\trap.h" />\r
     <ClInclude Include="..\..\src\types.h" />\r
     <ClInclude Include="..\..\src\z-config.h" />\r

diff --git a/src/Makefile.am b/src/Makefile.am
index f14fc30..c1cdb2d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ hengband_SOURCES = \
        rooms-special.c rooms-special.h rooms-trap.c rooms-trap.h rooms-vault.c \
        rooms-vault.h save.c scores.c selfinfo.c selfinfo.h shoot.c snipe.c \
        spells1.c spells2.c spells3.c spells-summon.c spells-summon.h \
-       store.c tables.c trap.c trap.h types.h util.c \
+       store.h store.c tables.c trap.c trap.h types.h util.c \
        variable.c wild.c wizard1.c wizard2.c xtra1.c xtra2.c z-config.h \
        z-form.c z-form.h z-rand.c z-rand.h z-term.c z-term.h z-util.c z-util.h \
        z-virt.c z-virt.h 

diff --git a/src/autopick.c b/src/autopick.c
index 8d60e03..0b2360a 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -12,7 +12,7 @@
  */
 
 #include "angband.h"
-
+#include "store.h"
 
 #define MAX_LINELEN 1024
 

diff --git a/src/birth.c b/src/birth.c
index 8a92971..74db397 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -14,6 +14,7 @@
 #include "angband.h"
 #include "history.h"
 #include "monster-hook.h"
+#include "store.h"
 
 /*!
  * オートローラーの内容を描画する間隔 / 

diff --git a/src/dungeon.c b/src/dungeon.c
index 237282a..eaf6135 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -23,6 +23,7 @@
 #include "cmd-pet.h"
 #include "floor-events.h"
 #include "object-curse.h"
+#include "store.h"
 
 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
 static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/

diff --git a/src/externs.h b/src/externs.h
index e442763..f6f7afd 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1068,14 +1068,6 @@ extern void massacre(void);
 extern bool eat_lock(void);
 extern bool shock_power(void);
 
-/* store.c */
-extern bool combine_and_reorder_home(int store_num);
-extern void do_cmd_store(void);
-extern void store_shuffle(int which);
-extern void store_maint(int town_num, int store_num);
-extern void store_init(int town_num, int store_num);
-extern void move_to_black_market(object_type * o_ptr);
-
 /* bldg.c */
 extern bool get_nightmare(MONRACE_IDX r_idx);
 extern void battle_monsters(void);

diff --git a/src/rooms-city.c b/src/rooms-city.c
index 9f9dc1e..df6ff39 100644 (file)
--- a/src/rooms-city.c
+++ b/src/rooms-city.c
@@ -3,6 +3,7 @@
 #include "generate.h"\r
 #include "rooms.h"\r
 #include "rooms-city.h"\r
+#include "store.h"\r
 \r
 \r
 \r

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index 3746791..e314482 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -1,7 +1,8 @@
 #include "angband.h"\r
+#include "generate.h"\r
 #include "grid.h"\r
 #include "rooms.h"\r
-#include "generate.h"\r
+#include "store.h"\r
 #include "trap.h"\r
 \r
 /*\r

diff --git a/src/store.c b/src/store.c
index bfc4261..13d17aa 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -14,6 +14,7 @@
 #include "cmd-item.h"
 #include "cmd-zapwand.h"
 #include "cmd-magiceat.h"
+#include "store.h"
 
 #define MIN_STOCK 12
 

diff --git a/src/store.h b/src/store.h
new file mode 100644 (file)
index 0000000..709f291
--- /dev/null
+++ b/src/store.h
@@ -0,0 +1,8 @@
+\r
+/* store.c */\r
+extern bool combine_and_reorder_home(int store_num);\r
+extern void do_cmd_store(void);\r
+extern void store_shuffle(int which);\r
+extern void store_maint(int town_num, int store_num);\r
+extern void store_init(int town_num, int store_num);\r
+extern void move_to_black_market(object_type * o_ptr);\r