[Refactor] #37353 load.h を追加して宣言を移動．

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 1b8d161..4f9bac3 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -322,6 +322,7 @@
     <ClInclude Include="..\..\src\history.h" />\r
     <ClInclude Include="..\..\src\init.h" />\r
     <ClInclude Include="..\..\src\kajitips.h" />\r
+    <ClInclude Include="..\..\src\load.h" />\r
     <ClInclude Include="..\..\src\melee.h" />\r
     <ClInclude Include="..\..\src\mind.h" />\r
     <ClInclude Include="..\..\src\monster-process.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index f173719..1473032 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -738,6 +738,9 @@
     <ClInclude Include="..\..\src\save.h">
       <Filter>io</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\load.h">
+      <Filter>io</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 65c0da3..d5d3f51 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ hengband_SOURCES = \
        gameoption.c gameoption.h gamevalue.h \
        grid.c grid.h h-basic.h h-config.h h-define.h \
        history.h history.c \
-       h-system.h h-type.h inet.c init.c init.h japanese.c load.c \
+       h-system.h h-type.h inet.c init.c init.h japanese.c load.c load.h \
        dungeon-file.c dungeon-file.h \
        main.c main-x11.c main-gcu.c \
        melee.h melee1.c mind.c mind.h \

diff --git a/src/externs.h b/src/externs.h
index 63d2701..bc7d82c 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -233,16 +233,10 @@ extern bool mon_fight;
 extern bool generate_encounter;
 extern concptr screen_dump;
 
-
 extern DEPTH *max_dlv;
 extern COMMAND_CODE now_message;
 extern bool use_menu;
 
-
-/* load.c */
-extern errr rd_savefile_new(void);
-extern bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode);
-
 /* racial.c */
 extern void do_cmd_racial_power(void);
 

diff --git a/src/floor-save.c b/src/floor-save.c
index 25a94b7..7a79966 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "load.h"
 #include "util.h"
 
 #include "artifact.h"

diff --git a/src/load.c b/src/load.c
index d2186cf..cc211b2 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -42,6 +42,8 @@
 
 #include "angband.h"
 #include "util.h"
+#include "load.h"
+
 #include "bldg.h"
 
 #include "dungeon.h"

diff --git a/src/load.h b/src/load.h
new file mode 100644 (file)
index 0000000..3fb7b55
--- /dev/null
+++ b/src/load.h
@@ -0,0 +1,5 @@
+#pragma once
+
+/* load.c */
+extern errr rd_savefile_new(void);
+extern bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode);

diff --git a/src/save.c b/src/save.c
index 6c05d34..e3b78d3 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -14,6 +14,7 @@
 #include "angband.h"
 #include "util.h"
 #include "save.h"
+#include "load.h"
 
 #include "artifact.h"
 #include "sort.h"