[Refactor] #37353 wild.h 追加。 / Add wild.h.

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index fd34de8..7b695fd 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -339,6 +339,7 @@
     <ClInclude Include="..\..\src\store.h" />\r
     <ClInclude Include="..\..\src\trap.h" />\r
     <ClInclude Include="..\..\src\types.h" />\r
+    <ClInclude Include="..\..\src\wild.h" />\r
     <ClInclude Include="..\..\src\world.h" />\r
     <ClInclude Include="..\..\src\z-config.h" />\r
     <ClInclude Include="..\..\src\z-form.h" />\r

diff --git a/src/birth.c b/src/birth.c
index d862a0e..9777edb 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -20,6 +20,7 @@
 #include "player-status.h"
 #include "spells.h"
 #include "spells-status.h"
+#include "wild.h"
 
 /*!
  * オートローラーの内容を描画する間隔 / 

diff --git a/src/cmd2.c b/src/cmd2.c
index ab18e65..6be7906 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -25,6 +25,7 @@
 #include "player-status.h"
 #include "realm-hex.h"
 #include "geometry.h"
+#include "wild.h"
 
 /*!
  * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理

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

diff --git a/src/effects.c b/src/effects.c
index a6e729e..d6ded87 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -20,6 +20,7 @@
 #include "spells-status.h"
 #include "realm-hex.h"
 #include "object-hook.h"
+#include "wild.h"
 
 /*!
  * @brief プレイヤーの継続行動を設定する。

diff --git a/src/externs.h b/src/externs.h
index 889b0cd..54e5895 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1371,16 +1371,6 @@ extern void py_pickup_floor(bool pickup);
 /* variable.c */
 extern bool easy_floor;
 
-/* wild.c */
-extern void set_floor_and_wall(DUNGEON_IDX type);
-extern void wilderness_gen(void);
-extern void wilderness_gen_small(void);
-extern errr init_wilderness(void);
-extern void init_wilderness_terrains(void);
-extern void seed_wilderness(void);
-extern errr parse_line_wilderness(char *buf, int ymin, int xmin, int ymax, int xmax, int *y, int *x);
-extern bool change_wild_mode(void);
-
 /* wizard1.c */
 extern void spoil_random_artifact(concptr fname);
 

diff --git a/src/floor-generate.c b/src/floor-generate.c
index e2a7933..83e2a15 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -105,6 +105,7 @@
 #include "monster.h"
 #include "quest.h"
 #include "player-status.h"
+#include "wild.h"
 
 int dun_tun_rnd; 
 int dun_tun_chg;

diff --git a/src/floor-save.c b/src/floor-save.c
index c7a6704..e895a1e 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -16,6 +16,7 @@
 #include "grid.h"
 #include "monster.h"
 #include "quest.h"
+#include "wild.h"
 
 
 static FLOOR_IDX new_floor_id;  /*!<次のフロアのID / floor_id of the destination */

diff --git a/src/init1.c b/src/init1.c
index b46e2b4..f4e5c15 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -51,6 +51,7 @@
 #include "monster.h"
 #include "artifact.h"
 #include "cmd-activate.h"
+#include "wild.h"
 
 
 

diff --git a/src/init2.c b/src/init2.c
index b3d5a94..02e9a0a 100644 (file)
--- a/src/init2.c
+++ b/src/init2.c
@@ -38,6 +38,7 @@
 #include "trap.h"
 #include "rooms.h"
 #include "store.h"
+#include "wild.h"
 
 #ifndef MACINTOSH
 #ifdef CHECK_MODIFICATION_TIME

diff --git a/src/wild.h b/src/wild.h
new file mode 100644 (file)
index 0000000..f4141af
--- /dev/null
+++ b/src/wild.h
@@ -0,0 +1,11 @@
+#pragma once
+
+/* wild.c */
+extern void set_floor_and_wall(DUNGEON_IDX type);
+extern void wilderness_gen(void);
+extern void wilderness_gen_small(void);
+extern errr init_wilderness(void);
+extern void init_wilderness_terrains(void);
+extern void seed_wilderness(void);
+extern errr parse_line_wilderness(char *buf, int ymin, int xmin, int ymax, int xmax, int *y, int *x);
+extern bool change_wild_mode(void);