[Refactor] #37353 japanese.h を作成して関連宣言を移動．vcprojのソースリストから kajitips.h を削除．

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index a270a79..16398bd 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -292,6 +292,7 @@
     <ClCompile Include="..\..\src\z-term.c" />\r
     <ClCompile Include="..\..\src\z-util.c" />\r
     <ClCompile Include="..\..\src\z-virt.c" />\r
+    <ClInclude Include="japanese.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\angband.h" />\r
@@ -325,7 +326,6 @@
     <ClInclude Include="..\..\src\history.h" />\r
     <ClInclude Include="..\..\src\inet.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

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 8348784..6ef95a0 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\src\japanese.c" />
     <ClCompile Include="..\..\src\main-win.c" />
     <ClCompile Include="..\..\src\readdib.c" />
     <ClCompile Include="..\..\src\tables.c" />
@@ -397,6 +396,9 @@
     <ClCompile Include="..\..\src\inet.c">
       <Filter>io</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\japanese.c">
+      <Filter>locale</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\defines.h" />
@@ -408,7 +410,6 @@
     <ClInclude Include="..\..\src\h-system.h" />
     <ClInclude Include="..\..\src\h-type.h" />
     <ClInclude Include="..\..\src\init.h" />
-    <ClInclude Include="..\..\src\kajitips.h" />
     <ClInclude Include="..\..\src\readdib.h" />
     <ClInclude Include="..\..\src\z-config.h" />
     <ClInclude Include="..\..\src\z-form.h" />
@@ -771,6 +772,9 @@
     <ClInclude Include="..\..\src\inet.h">
       <Filter>io</Filter>
     </ClInclude>
+    <ClInclude Include="japanese.h">
+      <Filter>locale</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -809,6 +813,9 @@
     <Filter Include="creature">
       <UniqueIdentifier>{60e19cec-2b2f-46e7-9de6-e441c26fb1b3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="locale">
+      <UniqueIdentifier>{4bdec353-0cac-4e25-98f9-bcc55f2c0ec3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index ad7e4ca..c29e04a 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 inet.h init.c init.h japanese.c load.c load.h \
+       h-system.h h-type.h inet.c inet.h init.c init.h japanese.c japanese.h 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/birth.c b/src/birth.c
index b3789c7..937a4ff 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -45,6 +45,7 @@
 #include "autopick.h"
 #include "save.h"
 #include "realm.h"
+#include "japanese.h"
 
  /*
   * The last character rolled,

diff --git a/src/chuukei.c b/src/chuukei.c
index ff104ae..61aa116 100644 (file)
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -12,6 +12,7 @@
 #include "util.h"
 #include "cmd-dump.h"
 #include "inet.h"
+#include "japanese.h"
 
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index 9042ded..f33a46d 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -38,6 +38,7 @@
 #include "view-mainwindow.h"
 #include "floor.h"
 #include "autopick.h"
+#include "japanese.h"
 
  /*!
   * 魔法領域フラグ管理テーブル /

diff --git a/src/japanese.c b/src/japanese.c
index 1706c0d..86df622 100644 (file)
--- a/src/japanese.c
+++ b/src/japanese.c
@@ -6,6 +6,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "japanese.h"
 
 #ifdef JP
 

diff --git a/src/japanese.h b/src/japanese.h
new file mode 100644 (file)
index 0000000..64b6136
--- /dev/null
+++ b/src/japanese.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#ifdef JP
+/* japanese.c */
+extern void sindarin_to_kana(char *kana, concptr sindarin);
+extern void jverb(concptr in, char *out, int flag);
+extern void sjis2euc(char *str);
+extern void euc2sjis(char *str);
+extern byte codeconv(char *str);
+extern bool iskanji2(concptr s, int x);
+extern void guess_convert_to_system_encoding(char* strbuf, int buflen);
+#endif

diff --git a/src/load.c b/src/load.c
index 5e64985..9e1eed3 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -80,6 +80,7 @@
 #include "objectkind.h"
 #include "object-ego.h"
 #include "save.h"
+#include "japanese.h"
 
 /*
  * Maximum number of tries for selection of a proper quest monster

diff --git a/src/monster1.c b/src/monster1.c
index 947128d..63bf7a3 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -31,6 +31,7 @@
 #include "dungeon.h"
 #include "world.h"
 #include "melee.h"
+#include "japanese.h"
 
 
 /*

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

diff --git a/src/scores.c b/src/scores.c
index cabe65a..2bd3393 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -25,6 +25,7 @@
 #include "world.h"
 #include "cmd-dump.h"
 #include "report.h"
+#include "japanese.h"
 
 /*!
  * @brief i番目のスコア情報にバッファ位置をシークする / Seek score 'i' in the highscore file

diff --git a/src/util.c b/src/util.c
index a79160d..8cda666 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -18,6 +18,7 @@
 #include "floor.h"
 #include "world.h"
 #include "cmd-dump.h"
+#include "japanese.h"
 
 /*!
  * 10進数から16進数への変換テーブル /