From 50f9ac6b18df21421a018c6a39fa4f7ff31356d7 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Thu, 20 Aug 2020 20:33:46 +0900
Subject: [PATCH] [Refactor] #40635 Separated info-initializer.c/h from init.c

---
 Hengband/Hengband/Hengband.vcxproj         |  2 ++
 Hengband/Hengband/Hengband.vcxproj.filters |  6 ++++++
 src/Makefile.am                            |  1 +
 src/main/info-initializer.c                | 10 ++++++++++
 src/main/info-initializer.h                |  5 +++++
 src/main/init.c                            | 10 +---------
 6 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 src/main/info-initializer.c
 create mode 100644 src/main/info-initializer.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 51f967ceb..e46ff4836 100644
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -283,6 +283,7 @@
     <ClCompile Include="..\..\src\io\input-key-requester.c" />
     <ClCompile Include="..\..\src\io\store-key-processor.c" />
     <ClCompile Include="..\..\src\load\info-loader.c" />
+    <ClCompile Include="..\..\src\main\info-initializer.c" />
     <ClCompile Include="..\..\src\melee\melee-spell-flags-checker.c" />
     <ClCompile Include="..\..\src\melee\melee-spell-util.c" />
     <ClCompile Include="..\..\src\melee\melee-spell.c" />
@@ -912,6 +913,7 @@
     <ClInclude Include="..\..\src\io\store-key-processor.h" />
     <ClInclude Include="..\..\src\load\info-loader.h" />
     <ClInclude Include="..\..\src\locale\language-switcher.h" />
+    <ClInclude Include="..\..\src\main\info-initializer.h" />
     <ClInclude Include="..\..\src\melee\melee-spell-flags-checker.h" />
     <ClInclude Include="..\..\src\melee\melee-spell-util.h" />
     <ClInclude Include="..\..\src\melee\melee-spell.h" />
diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index c0ec858ce..201d48652 100644
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2111,6 +2111,9 @@
     <ClCompile Include="..\..\src\core\object-compressor.c">
       <Filter>core</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\main\info-initializer.c">
+      <Filter>main</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -4573,6 +4576,9 @@
     <ClInclude Include="..\..\src\core\object-compressor.h">
       <Filter>core</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\main\info-initializer.h">
+      <Filter>main</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
diff --git a/src/Makefile.am b/src/Makefile.am
index b728dbd7c..5e62248ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -379,6 +379,7 @@ hengband_SOURCES = \
 	\
 	main.c main-x11.c main-gcu.c \
 	\
+	main/info-initializer.c main/info-initializer.h \
 	main/init.c main/init.h \
 	main/music-definitions-table.c main/music-definitions-table.h \
 	main/sound-definitions-table.c main/sound-definitions-table.h \
diff --git a/src/main/info-initializer.c b/src/main/info-initializer.c
new file mode 100644
index 000000000..c38de1ddd
--- /dev/null
+++ b/src/main/info-initializer.c
@@ -0,0 +1,10 @@
+#include "main/info-initializer.h"
+#include "info-reader/fixed-map-parser.h"
+
+/*!
+ * @brief Šî–{î•ñ“ǂݍž‚݂̃ƒCƒ“ƒ‹[ƒ`ƒ“ /
+ * Initialize misc. values
+ * @param player_ptr ƒvƒŒ[ƒ„[‚Ö‚ÌŽQÆƒ|ƒCƒ“ƒ^
+ * @return ƒGƒ‰[ƒR[ƒh
+ */
+errr init_misc(player_type *player_ptr) { return parse_fixed_map(player_ptr, "misc.txt", 0, 0, 0, 0); }
diff --git a/src/main/info-initializer.h b/src/main/info-initializer.h
new file mode 100644
index 000000000..471ebe74c
--- /dev/null
+++ b/src/main/info-initializer.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "system/angband.h"
+
+errr init_misc(player_type *player_ptr);
diff --git a/src/main/init.c b/src/main/init.c
index b72d3ed9a..0c132898c 100644
--- a/src/main/init.c
+++ b/src/main/init.c
@@ -46,7 +46,6 @@
 #include "info-reader/dungeon-reader.h"
 #include "info-reader/ego-reader.h"
 #include "info-reader/feature-reader.h"
-#include "info-reader/fixed-map-parser.h"
 #include "info-reader/general-parser.h"
 #include "info-reader/kind-reader.h"
 #include "info-reader/magic-reader.h"
@@ -57,6 +56,7 @@
 #include "io/files-util.h"
 #include "io/read-pref-file.h"
 #include "io/uid-checker.h"
+#include "main/info-initializer.h"
 #include "market/articles-on-sale.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags7.h"
@@ -543,14 +543,6 @@ static errr init_m_info(player_type *player_ptr)
 }
 
 /*!
- * @brief 基本情報読み込みのメインルーチン /
- * Initialize misc. values
- * @param player_ptr プレーヤーへの参照ポインタ
- * @return エラーコード
- */
-static errr init_misc(player_type *player_ptr) { return parse_fixed_map(player_ptr, "misc.txt", 0, 0, 0, 0); }
-
-/*!
  * @brief 町情報読み込みのメインルーチン /
  * Initialize town array
  * @return エラーコード
-- 
2.11.0