• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision563c5921e53d38a4a066143c65cb9f81dcba87b3 (tree)
Time2019-05-07 21:56:50
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 realm.c/h を追加して,関連変数を移動.

Change Summary

Incremental Difference

--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -246,6 +246,7 @@
246246 <ClCompile Include="..\..\src\realm-hex.c" />
247247 <ClCompile Include="..\..\src\realm-life.c" />
248248 <ClCompile Include="..\..\src\realm-trump.c" />
249+ <ClCompile Include="..\..\src\realm.c" />
249250 <ClCompile Include="..\..\src\report.c" />
250251 <ClCompile Include="..\..\src\rooms-city.c" />
251252 <ClCompile Include="..\..\src\rooms-fractal.c" />
@@ -366,6 +367,7 @@
366367 <ClInclude Include="..\..\src\realm-song.h" />
367368 <ClInclude Include="..\..\src\realm-sorcery.h" />
368369 <ClInclude Include="..\..\src\realm-trump.h" />
370+ <ClInclude Include="..\..\src\realm.h" />
369371 <ClInclude Include="..\..\src\rooms-city.h" />
370372 <ClInclude Include="..\..\src\rooms-fractal.h" />
371373 <ClInclude Include="..\..\src\rooms-normal.h" />
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -389,6 +389,9 @@
389389 <ClCompile Include="..\..\src\targeting.c">
390390 <Filter>io</Filter>
391391 </ClCompile>
392+ <ClCompile Include="..\..\src\realm.c">
393+ <Filter>spells</Filter>
394+ </ClCompile>
392395 </ItemGroup>
393396 <ItemGroup>
394397 <ClInclude Include="..\..\src\defines.h" />
@@ -748,6 +751,9 @@
748751 <ClInclude Include="..\..\src\snipe.h">
749752 <Filter>cmd</Filter>
750753 </ClInclude>
754+ <ClInclude Include="..\..\src\realm.h">
755+ <Filter>spells</Filter>
756+ </ClInclude>
751757 </ItemGroup>
752758 <ItemGroup>
753759 <None Include="..\..\src\wall.bmp" />
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,8 +61,8 @@ hengband_SOURCES = \
6161 quest.h quest.c\
6262 \
6363 racial.c racial.h \
64- realm-arcane.c \
65- realm-arcane.h realm-chaos.c realm-chaos.h realm-craft.c realm-craft.h \
64+ realm.c realm.h \
65+ realm-arcane.c realm-arcane.h realm-chaos.c realm-chaos.h realm-craft.c realm-craft.h \
6666 realm-crusade.c realm-crusade.h realm-daemon.c realm-daemon.h realm-death.c \
6767 realm-death.h realm-hex.c realm-hex.h realm-hissatsu.c realm-hissatsu.h \
6868 realm-life.c realm-life.h realm-nature.c realm-nature.h realm-song.c \
--- a/src/birth.c
+++ b/src/birth.c
@@ -43,6 +43,7 @@
4343 #include "monsterrace.h"
4444 #include "autopick.h"
4545 #include "save.h"
46+#include "realm.h"
4647
4748 /*
4849 * The last character rolled,
--- a/src/cmd-dump.c
+++ b/src/cmd-dump.c
@@ -74,7 +74,7 @@
7474 #include "spells.h"
7575 #include "objectkind.h"
7676 #include "floor-town.h"
77-
77+#include "realm.h"
7878 /*
7979 */
8080
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -13,6 +13,7 @@
1313 #include "selfinfo.h"
1414 #include "spells.h"
1515 #include "spells-summon.h"
16+#include "realm.h"
1617 #include "realm-arcane.h"
1718 #include "realm-chaos.h"
1819 #include "realm-craft.h"
--- a/src/core.c
+++ b/src/core.c
@@ -77,6 +77,7 @@
7777 #include "scores.h"
7878 #include "autopick.h"
7979 #include "save.h"
80+#include "realm.h"
8081
8182 /*!
8283 * コピーライト情報 /
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -21,6 +21,7 @@
2121 #include "object-ego.h"
2222 #include "monsterrace.h"
2323 #include "floor-town.h"
24+#include "realm.h"
2425
2526 dungeon_grid letter[255];
2627
--- a/src/externs.h
+++ b/src/externs.h
@@ -60,10 +60,7 @@ extern const byte adj_con_mhp[];
6060 extern const byte adj_chr_chm[];
6161 extern const byte extract_energy[200];
6262
63-extern const concptr realm_names[];
64-#ifdef JP
65-extern const concptr E_realm_names[];
66-#endif
63+
6764 extern const concptr spell_names[VALID_REALM][32];
6865 extern const concptr color_names[16];
6966 extern const concptr stat_names[6];
--- a/src/files.c
+++ b/src/files.c
@@ -46,6 +46,7 @@
4646 #include "monster-status.h"
4747 #include "object-flavor.h"
4848 #include "object-hook.h"
49+#include "realm.h"
4950 #include "realm-hex.h"
5051 #include "cmd-pet.h"
5152 #include "spells.h"
--- /dev/null
+++ b/src/realm.c
@@ -0,0 +1,59 @@
1+#include "angband.h"
2+#include "realm.h"
3+
4+#ifdef JP
5+/*!
6+ * 領域魔法名称
7+ */
8+const concptr realm_names[] =
9+{
10+ "魔法なし",
11+ "生命",
12+ "仙術",
13+ "自然",
14+ "カオス",
15+ "暗黒",
16+ "トランプ",
17+ "秘術",
18+ "匠",
19+ "悪魔",
20+ "破邪",
21+ "不明",
22+ "不明",
23+ "不明",
24+ "不明",
25+ "不明",
26+ "歌",
27+ "武芸",
28+ "呪術",
29+ "不明"
30+};
31+#endif
32+
33+#ifdef JP
34+const concptr E_realm_names[]
35+#else
36+const concptr realm_names[]
37+#endif
38+= {
39+ "none",
40+ "Life",
41+ "Sorcery",
42+ "Nature",
43+ "Chaos",
44+ "Death",
45+ "Trump",
46+ "Arcane",
47+ "Craft",
48+ "Daemon",
49+ "Crusade",
50+ "unknown",
51+ "unknown",
52+ "unknown",
53+ "unknown",
54+ "unknown",
55+ "Music",
56+ "Kendo",
57+ "Hex",
58+ "unknown"
59+};
--- /dev/null
+++ b/src/realm.h
@@ -0,0 +1,5 @@
1+#pragma once
2+extern const concptr realm_names[];
3+#ifdef JP
4+extern const concptr E_realm_names[];
5+#endif
\ No newline at end of file
--- a/src/report.c
+++ b/src/report.c
@@ -17,6 +17,7 @@
1717 #include "player-personality.h"
1818 #include "files.h"
1919 #include "world.h"
20+#include "realm.h"
2021
2122 #ifdef WORLD_SCORE
2223
--- a/src/tables.c
+++ b/src/tables.c
@@ -1039,62 +1039,6 @@ const byte extract_energy[200] =
10391039 /* Fast */ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
10401040 };
10411041
1042-#ifdef JP
1043-/*!
1044- * 領域魔法名称
1045- */
1046-const concptr realm_names[] =
1047-{
1048- "魔法なし",
1049- "生命",
1050- "仙術",
1051- "自然",
1052- "カオス",
1053- "暗黒",
1054- "トランプ",
1055- "秘術",
1056- "匠",
1057- "悪魔",
1058- "破邪",
1059- "不明",
1060- "不明",
1061- "不明",
1062- "不明",
1063- "不明",
1064- "歌",
1065- "武芸",
1066- "呪術",
1067- "不明"
1068-};
1069-#endif
1070-
1071-#ifdef JP
1072-const concptr E_realm_names[]
1073-#else
1074-const concptr realm_names[]
1075-#endif
1076-= {
1077- "none",
1078- "Life",
1079- "Sorcery",
1080- "Nature",
1081- "Chaos",
1082- "Death",
1083- "Trump",
1084- "Arcane",
1085- "Craft",
1086- "Daemon",
1087- "Crusade",
1088- "unknown",
1089- "unknown",
1090- "unknown",
1091- "unknown",
1092- "unknown",
1093- "Music",
1094- "Kendo",
1095- "Hex",
1096- "unknown"
1097-};
10981042
10991043 /*!
11001044 * @brief 色名称テーブル / Hack -- the "basic" color names (see "TERM_xxx")
Show on old repository browser