[Refactor] #37353 floor-save.h 追加。 / Add floor-save.h.

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index f6daa58..8b40187 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -283,6 +283,7 @@
     <ClInclude Include="..\..\src\externs.h" />\r
     <ClInclude Include="..\..\src\feature.h" />\r
     <ClInclude Include="..\..\src\floor-events.h" />\r
+    <ClInclude Include="..\..\src\floor-save.h" />\r
     <ClInclude Include="..\..\src\floor.h" />\r
     <ClInclude Include="..\..\src\gameoption.h" />\r
     <ClInclude Include="..\..\src\gamevalue.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 610073c..7481f54 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -445,6 +445,9 @@
     <ClInclude Include="..\..\src\object-boost.h">
       <Filter>object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\floor-save.h">
+      <Filter>floor</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/dungeon.c b/src/dungeon.c
index 29fa345..f1f1ca1 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -43,6 +43,7 @@
 #include "object-hook.h"
 #include "wild.h"
 #include "monster-status.h"
+#include "floor-save.h"
 
 
 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/

diff --git a/src/externs.h b/src/externs.h
index d7cf988..deea1e1 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -612,14 +612,11 @@ extern char *object_desc_kosuu(char *t, object_type *o_ptr);
 extern void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode);
 
 /* floors.c */
-extern void init_saved_floors(bool force);
 extern void clear_saved_floor_files(void);
 extern saved_floor_type *get_sf_ptr(FLOOR_IDX floor_id);
 extern FLOOR_IDX get_new_floor_id(void);
 extern void prepare_change_floor_mode(BIT_FLAGS mode);
 extern void precalc_cur_num_of_pet(void);
-extern void leave_floor(void);
-extern void change_floor(void);
 extern void stair_creation(void);
 extern bool build_tunnel(POSITION row1, POSITION col1, POSITION row2, POSITION col2);
 extern bool build_tunnel2(POSITION x1, POSITION y1, POSITION x2, POSITION y2, int type, int cutoff);

diff --git a/src/floor-save.h b/src/floor-save.h
new file mode 100644 (file)
index 0000000..24a6e18
--- /dev/null
+++ b/src/floor-save.h
@@ -0,0 +1,5 @@
+#pragma once
+
+extern void init_saved_floors(bool force);
+extern void change_floor(void);
+extern void leave_floor(void);

diff --git a/src/load.c b/src/load.c
index 03c1740..f5982f5 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -53,6 +53,8 @@
 #include "wild.h"
 #include "patron.h"
 
+#include "floor-save.h"
+
 
 /*
  * Maximum number of tries for selection of a proper quest monster

diff --git a/src/wizard2.c b/src/wizard2.c
index feb72ae..8c33555 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -11,7 +11,6 @@
  */
 
 #include "angband.h"
-#include "floor.h"
 #include "selfinfo.h"
 #include "patron.h"
 #include "mutation.h"
@@ -29,6 +28,9 @@
 #include "object-hook.h"
 #include "monster-status.h"
 
+#include "floor.h"
+#include "floor-save.h"
+
 #ifdef ALLOW_WIZARD
 
 /*!