[Refactor] #39970 Renamed core.c/h to system-variables.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 0729b88..ab396a0 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -264,7 +264,7 @@
     <ClCompile Include="..\..\src\cmd\object-group-table.c" />\r
     <ClCompile Include="..\..\src\combat\melee.c" />\r
     <ClCompile Include="..\..\src\combat\shoot.c" />\r
-    <ClCompile Include="..\..\src\core.c" />\r
+    <ClCompile Include="..\..\src\core\system-variables.c" />\r
     <ClCompile Include="..\..\src\core\show-file.c" />\r
     <ClCompile Include="..\..\src\creature.c" />\r
     <ClCompile Include="..\..\src\dungeon\dungeon-file.c" />\r
@@ -625,7 +625,7 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\angband.h" />\r
-    <ClInclude Include="..\..\src\core.h" />\r
+    <ClInclude Include="..\..\src\core\system-variables.h" />\r
     <ClInclude Include="..\..\src\creature.h" />\r
     <ClInclude Include="..\..\src\dungeon\dungeon-file.h" />\r
     <ClInclude Include="..\..\src\dungeon\dungeon.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 873aa36..7febe94 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -181,9 +181,6 @@
     <ClCompile Include="..\..\src\player-sex.c">
       <Filter>player</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\core.c">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\history.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -829,6 +826,9 @@
     <ClCompile Include="..\..\src\core\game-play.c">
       <Filter>core</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\core\system-variables.c">
+      <Filter>core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -995,9 +995,6 @@
     <ClInclude Include="..\..\src\player-sex.h">
       <Filter>player</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\core.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\angband.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -1691,6 +1688,9 @@
     <ClInclude Include="..\..\src\core\game-play.h">
       <Filter>core</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\core\system-variables.h">
+      <Filter>core</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 5a05ebb..73eb62d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,7 +84,8 @@ hengband_SOURCES = \
        io/uid-checker.c io/uid-checker.h \
        io/input-key-processor.c io/input-key-processor.h \
        \
-       character-dump.c character-dump.h core.c core.h files.c files.h \
+       character-dump.c character-dump.h files.c files.h \
+       core/system-variables.c core/system-variables.h \
        core/game-play.c core/game-play.h \
        core/show-file.c core/show-file.h \
        core/stuff-handler.c core/stuff-handler.h \

diff --git a/src/birth/birth.c b/src/birth/birth.c
index 99fb15b..cbd37a0 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -12,7 +12,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "core/show-file.h"
 #include "gameterm.h"
 #include "io/read-pref-file.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 575bdbf..147f632 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -13,7 +13,7 @@
 #include "angband.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "core/stuff-handler.h"
 #include "gameterm.h"
 

diff --git a/src/core/game-play.c b/src/core/game-play.c
index b2f7437..95d73d6 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -56,7 +56,7 @@
 #include "scores.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
-#include "core.h"
+#include "core/system-variables.h"
 
 /*!
  * @brief 1ゲームプレイの主要ルーチン / Actually play a game

diff --git a/src/core.c b/src/core/system-variables.c
similarity index 96%
rename from src/core.c
rename to src/core/system-variables.c
index c15bca4..b8fab77 100644 (file)
--- a/src/core.c
+++ b/src/core/system-variables.c
@@ -5,7 +5,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/system-variables.h"
 
  /*!
   * todo どこからも呼ばれていない。main関数辺りに移設するか、そもそもコメントでいいと思われる

diff --git a/src/core.h b/src/core/system-variables.h
similarity index 100%
rename from src/core.h
rename to src/core/system-variables.h

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index 2cd28b8..5ce1a6a 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -33,7 +33,7 @@
 
 #include "angband.h"
 #include "util.h"
-#include "core.h"
+#include "core/system-variables.h"
 
 #include "io/tokenizer.h"
 #include "files.h"

diff --git a/src/files.c b/src/files.c
index cbf8e0d..ef9b256 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -15,7 +15,7 @@
 #include "angband.h"
 #include "io/uid-checker.h"
 #include "files.h"
-#include "core.h" // 暫定。後で消す.
+#include "core/system-variables.h" // 暫定。後で消す.
 #include "character-dump.h"
 
 concptr ANGBAND_DIR; //!< Path name: The main "lib" directory This variable is not actually used anywhere in the code

diff --git a/src/floor-generate.c b/src/floor-generate.c
index c15105d..0bfa95f 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -98,7 +98,7 @@
 
 #include "angband.h"
 #include "util.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "market/building.h"
 
 #include "io/write-diary.h"

diff --git a/src/floor-save.c b/src/floor-save.c
index d62c7e1..014e292 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -12,7 +12,7 @@
 
 #include "angband.h"
 #include "market/building.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "load.h"
 #include "util.h"
 

diff --git a/src/gameterm.c b/src/gameterm.c
index 76dc520..02082fa 100644 (file)
--- a/src/gameterm.c
+++ b/src/gameterm.c
@@ -2,7 +2,7 @@
 #include "util.h"
 
 #include "gameterm.h"
-#include "core.h"
+#include "core/system-variables.h"
 
 
 /*

diff --git a/src/init.c b/src/init.c
index a42fa05..b5b422b 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -34,7 +34,7 @@
 #include "util.h"
 #include "io/uid-checker.h"
 #include "files.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "core/angband-version.h"
 #include "io/read-pref-file.h"
 #include "gameterm.h"

diff --git a/src/io/read-pref-file.c b/src/io/read-pref-file.c
index 78154a9..278039e 100644 (file)
--- a/src/io/read-pref-file.c
+++ b/src/io/read-pref-file.c
@@ -21,7 +21,7 @@
 #include "autopick/autopick-pref-processor.h"
 #include "files.h" // 暫定。コールバック化して後で消す.
 #include "world/world.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "autopick/autopick-reader-writer.h"
 
 // todo コールバック関数に変更するので、いずれ消す.

diff --git a/src/io/signal-handlers.c b/src/io/signal-handlers.c
index b6239da..70f44e0 100644 (file)
--- a/src/io/signal-handlers.c
+++ b/src/io/signal-handlers.c
@@ -6,7 +6,7 @@
  */
 
 #include "io/signal-handlers.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "core/game-closer.h"
 #include "save.h"
 #include "world/world.h"

diff --git a/src/io/write-diary.c b/src/io/write-diary.c
index 18273ef..ea7bc01 100644 (file)
--- a/src/io/write-diary.c
+++ b/src/io/write-diary.c
@@ -5,7 +5,7 @@
  */
 
 #include "io/write-diary.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "quest.h"
 #include "files.h"
 #include "dungeon/dungeon.h"

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 4993894..8ab665d 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -8,7 +8,7 @@
 #include "knowledge-quests.h"
 #include "cmd/dump-util.h"
 #include "quest.h"
-#include "core.h" // 暫定、init_flagsのため。後で消すかも.
+#include "core/system-variables.h" // 暫定、init_flagsのため。後で消すかも.
 #include "artifact.h"
 #include "object-flavor.h"
 #include "dungeon/dungeon.h"

diff --git a/src/load.c b/src/load.c
index cbaa3a7..876f3ea 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -42,7 +42,7 @@
 
 #include "angband.h"
 #include "util.h"
-#include "core.h" // 暫定、init_flags の扱いを決めた上で消す.
+#include "core/system-variables.h" // 暫定、init_flags の扱いを決めた上で消す.
 #include "core/angband-version.h"
 
 #include "load.h"

diff --git a/src/main-win.c b/src/main-win.c
index 24132ae..d822f77 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -109,7 +109,7 @@
 #include "scores.h"
 #include "quest.h"
 #include "files.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "core/game-play.h"
 #include "core/angband-version.h"
 #include "core/stuff-handler.h"

diff --git a/src/main-x11.c b/src/main-x11.c
index 771ee42..2441bc2 100644 (file)
--- a/src/main-x11.c
+++ b/src/main-x11.c
@@ -95,7 +95,7 @@
 
 #include "angband.h"
 #include "main/sound-definitions-table.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "files.h"
 #include "gameterm.h"
 

diff --git a/src/main.c b/src/main.c
index fa59d40..8a98e0b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -9,7 +9,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "uid-checker.h"
 #include "signal-handlers.h"
 #include "files.h"

diff --git a/src/market/building.c b/src/market/building.c
index 3503d33..31a28e9 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -17,7 +17,7 @@
 #include "main/music-definitions-table.h"
 #include "gameterm.h"
 
-#include "core.h" // 暫定、init_flags のため。後で消すかも.
+#include "core/system-variables.h" // 暫定、init_flags のため。後で消すかも.
 #include "core/stuff-handler.h"
 #include "core/show-file.h"
 #include "core/special-internal-keys.h"

diff --git a/src/monster2.c b/src/monster2.c
index 2165439..1dcaa82 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -13,7 +13,7 @@
 #include "angband.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
-#include "core.h"
+#include "core/system-variables.h"
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/object1.c b/src/object1.c
index d8b53dd..2a5a2ef 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -12,7 +12,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "io/read-pref-file.h"
 #include "util.h"
 

diff --git a/src/quest.c b/src/quest.c
index fda4eda..3bff2f6 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -2,7 +2,7 @@
 #include "util.h"
 #include "main/music-definitions-table.h"
 
-#include "core.h"
+#include "core/system-variables.h"
 #include "dungeon/dungeon.h"
 #include "floor.h"
 #include "floor-save.h"

diff --git a/src/spell/spells1.c b/src/spell/spells1.c
index b36c370..ef20cb5 100644 (file)
--- a/src/spell/spells1.c
+++ b/src/spell/spells1.c
@@ -12,7 +12,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 #include "cmd/cmd-pet.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 8a44015..b612704 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -12,7 +12,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/targeting.c b/src/targeting.c
index 931d05b..10bf888 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -12,7 +12,7 @@
 
 #include "angband.h"
 #include "util.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "core/stuff-handler.h"
 #include "gameterm.h"
 #include "targeting.h"

diff --git a/src/util.c b/src/util.c
index a5c2d5a..45a0b5c 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -13,7 +13,7 @@
 #include "angband.h"
 #include "main/music-definitions-table.h"
 #include "io/signal-handlers.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "core/stuff-handler.h"
 #include "gameterm.h"
 #include "util.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 4e90a56..2b546ec 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -18,7 +18,7 @@
 #include "gameterm.h"
 
 #include "market/building.h"
-#include "core.h"
+#include "core/system-variables.h"
 #include "core/stuff-handler.h"
 #include "files.h"
 #include "world/world.h"

diff --git a/src/view/display-player.c b/src/view/display-player.c
index c47af77..9db9e84 100644 (file)
--- a/src/view/display-player.c
+++ b/src/view/display-player.c
@@ -15,7 +15,7 @@
 #include "patron.h"
 #include "world/world.h"
 #include "quest.h"
-#include "core.h" // 暫定。後で消す
+#include "core/system-variables.h" // 暫定。後で消す
 #include "knowledge/knowledge-mutations.h"
 #include "dungeon/dungeon-file.h"
 #include "object/object-kind.h"

diff --git a/src/wild.c b/src/wild.c
index fdebe43..2291eda 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -12,7 +12,7 @@
 
 #include "angband.h"
 #include "util.h"
-#include "core.h"
+#include "core/system-variables.h"
 
 #include "dungeon/dungeon.h"
 #include "floor.h"