• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision733299bc2c5e9653c68714bc02302147d7a8effc (tree)
Time2019-05-12 11:01:03
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

Incremental Difference

--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -292,6 +292,7 @@
292292 <ClCompile Include="..\..\src\z-term.c" />
293293 <ClCompile Include="..\..\src\z-util.c" />
294294 <ClCompile Include="..\..\src\z-virt.c" />
295+ <ClInclude Include="japanese.h" />
295296 </ItemGroup>
296297 <ItemGroup>
297298 <ClInclude Include="..\..\src\angband.h" />
@@ -325,7 +326,6 @@
325326 <ClInclude Include="..\..\src\history.h" />
326327 <ClInclude Include="..\..\src\inet.h" />
327328 <ClInclude Include="..\..\src\init.h" />
328- <ClInclude Include="..\..\src\kajitips.h" />
329329 <ClInclude Include="..\..\src\load.h" />
330330 <ClInclude Include="..\..\src\melee.h" />
331331 <ClInclude Include="..\..\src\mind.h" />
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -1,7 +1,6 @@
11 <?xml version="1.0" encoding="utf-8"?>
22 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33 <ItemGroup>
4- <ClCompile Include="..\..\src\japanese.c" />
54 <ClCompile Include="..\..\src\main-win.c" />
65 <ClCompile Include="..\..\src\readdib.c" />
76 <ClCompile Include="..\..\src\tables.c" />
@@ -397,6 +396,9 @@
397396 <ClCompile Include="..\..\src\inet.c">
398397 <Filter>io</Filter>
399398 </ClCompile>
399+ <ClCompile Include="..\..\src\japanese.c">
400+ <Filter>locale</Filter>
401+ </ClCompile>
400402 </ItemGroup>
401403 <ItemGroup>
402404 <ClInclude Include="..\..\src\defines.h" />
@@ -408,7 +410,6 @@
408410 <ClInclude Include="..\..\src\h-system.h" />
409411 <ClInclude Include="..\..\src\h-type.h" />
410412 <ClInclude Include="..\..\src\init.h" />
411- <ClInclude Include="..\..\src\kajitips.h" />
412413 <ClInclude Include="..\..\src\readdib.h" />
413414 <ClInclude Include="..\..\src\z-config.h" />
414415 <ClInclude Include="..\..\src\z-form.h" />
@@ -771,6 +772,9 @@
771772 <ClInclude Include="..\..\src\inet.h">
772773 <Filter>io</Filter>
773774 </ClInclude>
775+ <ClInclude Include="japanese.h">
776+ <Filter>locale</Filter>
777+ </ClInclude>
774778 </ItemGroup>
775779 <ItemGroup>
776780 <None Include="..\..\src\wall.bmp" />
@@ -809,6 +813,9 @@
809813 <Filter Include="creature">
810814 <UniqueIdentifier>{60e19cec-2b2f-46e7-9de6-e441c26fb1b3}</UniqueIdentifier>
811815 </Filter>
816+ <Filter Include="locale">
817+ <UniqueIdentifier>{4bdec353-0cac-4e25-98f9-bcc55f2c0ec3}</UniqueIdentifier>
818+ </Filter>
812819 </ItemGroup>
813820 <ItemGroup>
814821 <ResourceCompile Include="..\..\src\angband.rc" />
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ hengband_SOURCES = \
3232 gameoption.c gameoption.h gamevalue.h \
3333 grid.c grid.h h-basic.h h-config.h h-define.h \
3434 history.h history.c \
35- h-system.h h-type.h inet.c inet.h init.c init.h japanese.c load.c load.h \
35+ h-system.h h-type.h inet.c inet.h init.c init.h japanese.c japanese.h load.c load.h \
3636 dungeon-file.c dungeon-file.h \
3737 main.c main-x11.c main-gcu.c \
3838 melee.h melee1.c mind.c mind.h \
--- a/src/birth.c
+++ b/src/birth.c
@@ -45,6 +45,7 @@
4545 #include "autopick.h"
4646 #include "save.h"
4747 #include "realm.h"
48+#include "japanese.h"
4849
4950 /*
5051 * The last character rolled,
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -12,6 +12,7 @@
1212 #include "util.h"
1313 #include "cmd-dump.h"
1414 #include "inet.h"
15+#include "japanese.h"
1516
1617 #include <stdio.h>
1718 #include <stdarg.h>
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -38,6 +38,7 @@
3838 #include "view-mainwindow.h"
3939 #include "floor.h"
4040 #include "autopick.h"
41+#include "japanese.h"
4142
4243 /*!
4344 * 魔法領域フラグ管理テーブル /
--- a/src/japanese.c
+++ b/src/japanese.c
@@ -6,6 +6,7 @@
66
77 #include "angband.h"
88 #include "util.h"
9+#include "japanese.h"
910
1011 #ifdef JP
1112
--- /dev/null
+++ b/src/japanese.h
@@ -0,0 +1,12 @@
1+#pragma once
2+
3+#ifdef JP
4+/* japanese.c */
5+extern void sindarin_to_kana(char *kana, concptr sindarin);
6+extern void jverb(concptr in, char *out, int flag);
7+extern void sjis2euc(char *str);
8+extern void euc2sjis(char *str);
9+extern byte codeconv(char *str);
10+extern bool iskanji2(concptr s, int x);
11+extern void guess_convert_to_system_encoding(char* strbuf, int buflen);
12+#endif
--- a/src/load.c
+++ b/src/load.c
@@ -80,6 +80,7 @@
8080 #include "objectkind.h"
8181 #include "object-ego.h"
8282 #include "save.h"
83+#include "japanese.h"
8384
8485 /*
8586 * Maximum number of tries for selection of a proper quest monster
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -31,6 +31,7 @@
3131 #include "dungeon.h"
3232 #include "world.h"
3333 #include "melee.h"
34+#include "japanese.h"
3435
3536
3637 /*
--- a/src/object-flavor.c
+++ b/src/object-flavor.c
@@ -25,6 +25,7 @@
2525 #include "world.h"
2626 #include "monsterrace.h"
2727 #include "object-ego.h"
28+#include "japanese.h"
2829
2930 /*!
3031 * @brief アイテムの価値記述テーブル /
--- a/src/scores.c
+++ b/src/scores.c
@@ -25,6 +25,7 @@
2525 #include "world.h"
2626 #include "cmd-dump.h"
2727 #include "report.h"
28+#include "japanese.h"
2829
2930 /*!
3031 * @brief i番目のスコア情報にバッファ位置をシークする / Seek score 'i' in the highscore file
--- a/src/util.c
+++ b/src/util.c
@@ -18,6 +18,7 @@
1818 #include "floor.h"
1919 #include "world.h"
2020 #include "cmd-dump.h"
21+#include "japanese.h"
2122
2223 /*!
2324 * 10進数から16進数への変換テーブル /
Show on old repository browser