[Refactor] #38862 Moved english/japanese.c/h to locale/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 16fa213..6d33be6 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -269,7 +269,7 @@
     <ClCompile Include="..\..\src\creature.c" />\r
     <ClCompile Include="..\..\src\dungeon\dungeon-file.c" />\r
     <ClCompile Include="..\..\src\dungeon\dungeon.c" />\r
-    <ClCompile Include="..\..\src\english.c" />\r
+    <ClCompile Include="..\..\src\locale\english.c" />\r
     <ClCompile Include="..\..\src\feature.c" />\r
     <ClCompile Include="..\..\src\floor\floor-events.c" />\r
     <ClCompile Include="..\..\src\floor\floor-generate.c" />\r
@@ -447,7 +447,7 @@
     <ClCompile Include="..\..\src\files.c" />\r
     <ClCompile Include="..\..\src\grid.c" />\r
     <ClCompile Include="..\..\src\inet.c" />\r
-    <ClCompile Include="..\..\src\japanese.c" />\r
+    <ClCompile Include="..\..\src\locale\japanese.c" />\r
     <ClCompile Include="..\..\src\load.c" />\r
     <ClCompile Include="..\..\src\main-win.c" />\r
     <ClCompile Include="..\..\src\mind.c" />\r
@@ -556,7 +556,7 @@
     <ClInclude Include="..\..\src\combat\melee.h" />\r
     <ClInclude Include="..\..\src\combat\shoot.h" />\r
     <ClInclude Include="..\..\src\core\show-file.h" />\r
-    <ClInclude Include="..\..\src\english.h" />\r
+    <ClInclude Include="..\src\locele\english.h" />\r
     <ClInclude Include="..\..\src\horror-descriptions.h" />\r
     <ClInclude Include="..\..\src\io\gf-descriptions.h" />\r
     <ClInclude Include="..\..\src\io\interpret-pref-file.h" />\r
@@ -621,7 +621,7 @@
     <ClInclude Include="..\..\src\wizard\wizard-spoiler.h" />\r
     <ClInclude Include="..\..\src\world\world-movement-processor.h" />\r
     <ClInclude Include="..\..\src\world\world-turn-processor.h" />\r
-    <ClInclude Include="japanese.h" />\r
+    <ClInclude Include="..\src\locele\japanese.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\system\angband.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index d608666..8630dcb 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -97,12 +97,6 @@
     <ClCompile Include="..\..\src\inet.c">
       <Filter>io</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\japanese.c">
-      <Filter>locale</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\english.c">
-      <Filter>locale</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cmd\cmd-activate.c">
       <Filter>cmd</Filter>
     </ClCompile>
@@ -829,6 +823,12 @@
     <ClCompile Include="..\..\src\spell\mspells4.c">
       <Filter>spell</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\locale\english.c">
+      <Filter>locale</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\locale\japanese.c">
+      <Filter>locale</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -927,12 +927,6 @@
     <ClInclude Include="..\..\src\inet.h">
       <Filter>io</Filter>
     </ClInclude>
-    <ClInclude Include="japanese.h">
-      <Filter>locale</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\english.h">
-      <Filter>locale</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cmd\cmd-activate.h">
       <Filter>cmd</Filter>
     </ClInclude>
@@ -1701,6 +1695,12 @@
     <ClInclude Include="..\..\src\spell\monster-spell.h">
       <Filter>spell</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\locele\japanese.h">
+      <Filter>locale</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\locele\english.h">
+      <Filter>locale</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index beb46ca..fd46580 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,6 +109,8 @@ hengband_SOURCES = \
        floor/floor-streams.c floor/floor-streams.h \
        floor/pattern-walk.c floor/pattern-walk.h \
        \
+       locale/japanese.c locale/japanese.h locale/english.c locale/english.h \
+       \
        feature.c feature.h \
        geometry.c geometry.h \
        \
@@ -116,7 +118,6 @@ hengband_SOURCES = \
        grid.c grid.h\
        history.h history.c \
        inet.c inet.h init.c init.h \
-       japanese.c japanese.h english.c english.h \
        load.c load.h \
        main.c main-x11.c main-gcu.c \
        mind.c mind.h \
@@ -301,7 +302,7 @@ COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
        -Iautopick -Ibirth -Icmd -Icombat -Icore -Idungeon -Ieffect -Ifloor \
        -Iinventory -Iio -Iknowledge -Imarket -Imonster -Iobject -Iplayer -Irealm \
-       -Iroom -Ispell -Iview -Iwizard -Iworld
+       -Iroom -Ispell -Isystem -Iview -Iwizard -Iworld
 
 install-exec-hook:
 if SET_GID

diff --git a/src/birth/birth.c b/src/birth/birth.c
index a7efdf2..1132b06 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -35,7 +35,7 @@
 #include "floor/floor.h"
 #include "history.h"
 #include "io/write-diary.h"
-#include "japanese.h"
+#include "locale/japanese.h"
 #include "market/store.h"
 #include "monster/monster.h"
 #include "monster/monsterrace-hook.h"

diff --git a/src/chuukei.c b/src/chuukei.c
index c3519d4..1ad7af9 100644 (file)
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -15,7 +15,7 @@
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-draw.h"
 #include "inet.h"
-#include "japanese.h"
+#include "locale/japanese.h"
 #include "chuukei.h"
 
 #include <stdio.h>

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index bf98d7c..5b93929 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -46,7 +46,7 @@
 #include "artifact.h"
 #include "floor/floor-town.h"
 #include "cmd/feeling-table.h"
-#include "english.h"
+#include "locale/english.h"
 
 #include "chuukei.h"
 

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index 86169c6..5a13f93 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -33,7 +33,7 @@
 #include "view/display-main-window.h"
 #include "floor/floor.h"
 #include "autopick/autopick-reader-writer.h"
-#include "japanese.h"
+#include "locale/japanese.h"
 #include "spell/spells-util.h"
 #include "spell/spells-execution.h"
 

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index 259bb51..0eeaaa3 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -14,7 +14,7 @@
 #include "world/world.h"
 #include "core/show-file.h"
 #include "gameterm.h"
-#include "english.h"
+#include "locale/english.h"
 
 #include "core/stuff-handler.h"
 #include "view/display-main-window.h" // 暫定、後で消す.

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 4541e16..997f118 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -16,7 +16,7 @@
 #include "sort.h"
 #include "world/world.h"
 #include "core/show-file.h"
-#include "english.h"
+#include "locale/english.h"
 
  /*
   * Check on the status of an active quest

diff --git a/src/load.c b/src/load.c
index ca4302a..b006e23 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -84,7 +84,7 @@
 #include "object/object-kind.h"
 #include "object/object-ego.h"
 #include "save.h"
-#include "japanese.h"
+#include "locale/japanese.h"
 #include "cmd-smith.h"
 
  /*

diff --git a/src/english.c b/src/locale/english.c
similarity index 100%
rename from src/english.c
rename to src/locale/english.c

diff --git a/src/english.h b/src/locale/english.h
similarity index 100%
rename from src/english.h
rename to src/locale/english.h

diff --git a/src/japanese.c b/src/locale/japanese.c
similarity index 100%
rename from src/japanese.c
rename to src/locale/japanese.c

diff --git a/src/japanese.h b/src/locale/japanese.h
similarity index 100%
rename from src/japanese.h
rename to src/locale/japanese.h

diff --git a/src/market/store.c b/src/market/store.c
index 8166acc..35bee32 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -59,7 +59,7 @@
 #include "autopick/autopick.h"
 #include "autopick/autopick-pref-processor.h"
 #include "floor/floor-town.h"
-#include "japanese.h"
+#include "locale/japanese.h"
 #include "view/display-main-window.h"
 #include "wild.h"
 

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 776c2ec..e4a2c9f 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -34,10 +34,10 @@
 #include "dungeon/dungeon.h"
 #include "world/world.h"
 #include "melee.h"
-#include "japanese.h"
+#include "locale/japanese.h"
 #include "view/display-main-window.h"
 #include "player/player-class.h"
-#include "english.h"
+#include "locale/english.h"
 #include "market/arena-info-table.h"
 #include "spell/process-effect.h"
 

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index a82385c..a8617db 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -27,7 +27,7 @@
 #include "world/world.h"
 #include "monster/monsterrace.h"
 #include "object/object-ego.h"
-#include "japanese.h"
+#include "locale/japanese.h"
 
  /*!
   * @brief アイテムの価値記述テーブル

diff --git a/src/quest.c b/src/quest.c
index f510d9c..789cfe2 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -18,7 +18,7 @@
 #include "world/world.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
-#include "english.h"
+#include "locale/english.h"
 #include "view/display-main-window.h"
 
 quest_type *quest; /*!< Quest info */

diff --git a/src/scores.c b/src/scores.c
index 2e5022e..25a508b 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -31,7 +31,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "report.h"
-#include "japanese.h"
+#include "locale/japanese.h"
 
  /*
   * The "highscore" file descriptor, if available.

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 146c464..548d87d 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -60,7 +60,7 @@
 #include "monster/monsterrace.h"
 #include "targeting.h"
 #include "realm/realm-song.h"
-#include "english.h"
+#include "locale/english.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"

diff --git a/src/util.c b/src/util.c
index 8aeb6d3..3ae76b1 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -25,7 +25,7 @@
 #include "world/world.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
-#include "japanese.h"
+#include "locale/japanese.h"
 #include "player/player-class.h"
 #include "core/output-updater.h"
 #include "io/input-key-processor.h"