• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision640fd6e14204dd663762d87c56fa2d5f8eb91247 (tree)
Time2019-05-02 20:21:20
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 player-race.c/h を作成して関連構造体と変数を移動.

Change Summary

Incremental Difference

--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -179,6 +179,7 @@
179179 <ClCompile Include="..\..\src\player-class.c" />
180180 <ClCompile Include="..\..\src\player-damage.c" />
181181 <ClCompile Include="..\..\src\player-effects.c" />
182+ <ClCompile Include="..\..\src\player-race.c" />
182183 <ClCompile Include="..\..\src\player-skill.c" />
183184 <ClCompile Include="..\..\src\player-status.c" />
184185 <ClCompile Include="..\..\src\quest.c" />
@@ -339,6 +340,7 @@
339340 <ClInclude Include="..\..\src\player-damage.h" />
340341 <ClInclude Include="..\..\src\player-effects.h" />
341342 <ClInclude Include="..\..\src\player-move.h" />
343+ <ClInclude Include="..\..\src\player-race.h" />
342344 <ClInclude Include="..\..\src\player-skill.h" />
343345 <ClInclude Include="..\..\src\player-status.h" />
344346 <ClInclude Include="..\..\src\quest.h" />
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -336,6 +336,9 @@
336336 <ClCompile Include="..\..\src\floor-town.c">
337337 <Filter>floor</Filter>
338338 </ClCompile>
339+ <ClCompile Include="..\..\src\player-race.c">
340+ <Filter>player</Filter>
341+ </ClCompile>
339342 </ItemGroup>
340343 <ItemGroup>
341344 <ClInclude Include="..\..\src\angband.h" />
@@ -638,6 +641,9 @@
638641 <ClInclude Include="..\..\src\floor-town.h">
639642 <Filter>floor</Filter>
640643 </ClInclude>
644+ <ClInclude Include="..\..\src\player-race.h">
645+ <Filter>player</Filter>
646+ </ClInclude>
641647 </ItemGroup>
642648 <ItemGroup>
643649 <ResourceCompile Include="..\..\src\angband.rc" />
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,6 +56,7 @@ hengband_SOURCES = \
5656 \
5757 player-move.c player-move.h player-damage.c player-damage.h player-status.c player-status.h \
5858 player-effects.c player-effects.h player-skill.c player-skill.h player-class.c player-class.h \
59+ player-race.c player-race.h \
5960 \
6061 quest.h quest.c\
6162 \
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -21,6 +21,7 @@
2121 #include "player-status.h"
2222 #include "player-move.h"
2323 #include "player-class.h"
24+#include "player-race.h"
2425 #include "objectkind.h"
2526 #include "object-ego.h"
2627 #include "object-flavor.h"
--- a/src/birth.c
+++ b/src/birth.c
@@ -33,6 +33,7 @@
3333 #include "floor-town.h"
3434 #include "files.h"
3535 #include "birth.h"
36+#include "player-race.h"
3637 #include "player-skill.h"
3738 #include "world.h"
3839 #include "objectkind.h"
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -17,6 +17,7 @@
1717 #include "realm-hex.h"
1818 #include "player-status.h"
1919 #include "player-effects.h"
20+#include "player-race.h"
2021 #include "floor.h"
2122 #include "objectkind.h"
2223
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -18,6 +18,7 @@
1818 #include "spells-status.h"
1919 #include "player-status.h"
2020 #include "player-effects.h"
21+#include "player-race.h"
2122 #include "realm-hex.h"
2223 #include "spells-floor.h"
2324 #include "object-broken.h"
--- a/src/core.c
+++ b/src/core.c
@@ -53,6 +53,7 @@
5353 #include "player-move.h"
5454 #include "player-status.h"
5555 #include "player-class.h"
56+#include "player-race.h"
5657 #include "cmd-spell.h"
5758 #include "realm-hex.h"
5859 #include "objectkind.h"
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -9,6 +9,7 @@
99 #include "monster.h"
1010 #include "files.h"
1111 #include "player-skill.h"
12+#include "player-race.h"
1213 #include "dungeon.h"
1314 #include "floor.h"
1415 #include "bldg.h"
--- a/src/externs.h
+++ b/src/externs.h
@@ -70,10 +70,8 @@ extern const byte adj_chr_chm[];
7070 extern const byte blows_table[12][12];
7171 extern const byte extract_energy[200];
7272 extern const player_sex sex_info[MAX_SEXES];
73-extern const player_race race_info[MAX_RACES];
7473
7574 extern const player_seikaku seikaku_info[MAX_SEIKAKU];
76-extern const player_race mimic_info[];
7775 extern const u32b fake_spell_flags[4];
7876 extern const concptr realm_names[];
7977 #ifdef JP
@@ -218,7 +216,6 @@ extern SYMBOL_CODE tval_to_char[128];
218216 extern concptr keymap_act[KEYMAP_MODES][256];
219217 extern player_type *p_ptr;
220218 extern const player_sex *sp_ptr;
221-extern const player_race *rp_ptr;
222219 extern const player_seikaku *ap_ptr;
223220 extern char *f_name;
224221 extern char *f_tag;
--- a/src/files.c
+++ b/src/files.c
@@ -22,6 +22,7 @@
2222 #include "bldg.h"
2323
2424 #include "world.h"
25+#include "player-race.h"
2526 #include "player-status.h"
2627 #include "player-move.h"
2728 #include "player-class.h"
--- a/src/load.c
+++ b/src/load.c
@@ -69,6 +69,7 @@
6969 #include "files.h"
7070 #include "player-skill.h"
7171 #include "player-class.h"
72+#include "player-race.h"
7273 #include "birth.h"
7374 #include "world.h"
7475 #include "objectkind.h"
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -26,16 +26,17 @@
2626 #include "object-flavor.h"
2727 #include "object-hook.h"
2828 #include "grid.h"
29-#include "player-move.h"
3029 #include "dungeon.h"
3130 #include "floor.h"
3231 #include "dungeon.h"
3332 #include "spells.h"
3433 #include "files.h"
34+#include "player-move.h"
3535 #include "player-effects.h"
3636 #include "player-skill.h"
3737 #include "player-damage.h"
3838 #include "player-status.h"
39+#include "player-race.h"
3940 #include "view-mainwindow.h"
4041 #include "world.h"
4142
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -7,6 +7,7 @@
77 #include "artifact.h"
88 #include "player-class.h"
99 #include "player-skill.h"
10+#include "player-race.h"
1011 #include "quest.h"
1112 #include "world.h"
1213 #include "objectkind.h"
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -33,6 +33,7 @@
3333 #include "player-class.h"
3434 #include "player-move.h"
3535 #include "player-effects.h"
36+#include "player-race.h"
3637 #include "player-class.h"
3738 #include "monster-status.h"
3839 #include "snipe.h"
--- /dev/null
+++ b/src/player-race.c
@@ -0,0 +1,665 @@
1+#include "angband.h"
2+#include "player-race.h"
3+
4+
5+
6+/*!
7+ * @brief 種族情報 /
8+ * Player Races
9+ * @details
10+ * <pre>
11+ * Title,
12+ * {STR,INT,WIS,DEX,CON,CHR},
13+ * r_dis, r_dev, r_sav, r_stl, r_srh, r_fos, r_thn, r_thb,
14+ * hitdie, exp base,
15+ * Age (Base, Mod),
16+ * Male (Hgt, Wgt),
17+ * Female (Hgt, Wgt)
18+ * infra,
19+ * class-choices
20+ * </pre>
21+ */
22+const player_race race_info[MAX_RACES] =
23+{
24+ {
25+#ifdef JP
26+ "人間",
27+#endif
28+ "Human",
29+
30+ { 0, 0, 0, 0, 0, 0 },
31+ 0, 0, 0, 0, 0, 10, 0, 0,
32+ 10, 100,
33+ 14, 6,
34+ 72, 6, 180, 25,
35+ 66, 4, 150, 20,
36+ 0,
37+ 0xFFFFFFF,
38+ },
39+ {
40+#ifdef JP
41+ "ハーフエルフ",
42+#endif
43+ "Half-Elf",
44+
45+ { -1, 1, 1, 1, -1, 1 },
46+ 2, 3, 2, 1, 6, 11, -1, 5,
47+ 9, 110,
48+ 24, 16,
49+ 66, 6, 130, 15,
50+ 62, 6, 100, 10,
51+ 2,
52+ 0xE77E7FF,
53+ },
54+ {
55+#ifdef JP
56+ "エルフ",
57+#endif
58+ "Elf",
59+
60+ { -1, 2, 0, 1, -2, 2 },
61+ 5, 6, 4, 2, 8, 12, -5, 15,
62+ 8, 120,
63+ 75, 75,
64+ 60, 4, 100, 6,
65+ 54, 4, 80, 6,
66+ 3,
67+ 0xE77E75B,
68+
69+ },
70+ {
71+#ifdef JP
72+ "ホビット",
73+#endif
74+ "Hobbit",
75+
76+ { -2, 1, 1, 3, 2, 1 },
77+ 15, 12, 10, 5, 12, 15, -10, 20,
78+ 7, 110,
79+ 21, 12,
80+ 36, 3, 60, 3,
81+ 33, 3, 50, 3,
82+ 4,
83+ 0xF6FFC0B,
84+ },
85+ {
86+#ifdef JP
87+ "ノーム",
88+#endif
89+ "Gnome",
90+
91+ { -1, 2, 0, 2, 1, -1 },
92+ 10, 8, 7, 3, 6, 13, -8, 12,
93+ 8, 120,
94+ 50, 40,
95+ 42, 3, 90, 6,
96+ 39, 3, 75, 3,
97+ 4,
98+ 0xF67D60F,
99+ },
100+ {
101+#ifdef JP
102+ "ドワーフ",
103+#endif
104+ "Dwarf",
105+
106+ { 2, -2, 2, -2, 2, -1 },
107+ 2, 7, 6, -1, 7, 10, 15, 0,
108+ 11, 125,
109+ 35, 15,
110+ 48, 3, 150, 10,
111+ 46, 3, 120, 10,
112+ 5,
113+ 0x1890005,
114+ },
115+ {
116+#ifdef JP
117+ "ハーフオーク",
118+#endif
119+ "Half-Orc",
120+
121+ { 2, -1, 0, 0, 1, -2 },
122+ -3, -3, -2, -1, 0, 7, 12, -5,
123+ 10, 110,
124+ 11, 4,
125+ 66, 1, 150, 5,
126+ 62, 1, 120, 5,
127+ 3,
128+ 0xDD8818D,
129+ },
130+ {
131+#ifdef JP
132+ "ハーフトロル",
133+#endif
134+ "Half-Troll",
135+
136+ { 4, -4, -1, -3, 3, -3 },
137+ -5, -8, -5, -2, -1, 5, 20, -10,
138+ 12, 125,
139+ 20, 10,
140+ 96, 10, 250, 50,
141+ 84, 8, 225, 40,
142+ 3,
143+ 0x0880005,
144+ },
145+ {
146+#ifdef JP
147+ "アンバライト",
148+#endif
149+ "Amberite",
150+
151+ { 1, 2, 2, 2, 3, 2 },
152+ 4, 5, 3, 2, 3, 13, 15, 10,
153+ 10, 225,
154+ 50, 50,
155+ 82, 5, 190, 20,
156+ 78, 6, 180, 15,
157+ 0,
158+ 0xFFFF7FF,
159+ },
160+ {
161+#ifdef JP
162+ "ハイエルフ",
163+#endif
164+ "High-Elf",
165+
166+ { 1, 3, -1, 3, 1, 3 },
167+ 4, 13, 12, 4, 3, 14, 10, 25,
168+ 10, 200,
169+ 100, 30,
170+ 90, 10, 190, 20,
171+ 82, 10, 180, 15,
172+ 4,
173+ 0xF77E75B,
174+ },
175+ {
176+#ifdef JP
177+ "野蛮人",
178+#endif
179+ "Barbarian",
180+
181+ { 3, -2, -1, 1, 2, 0 },
182+ -2, -10, 2, -1, 1, 7, 12, 10,
183+ 11, 120,
184+ 14, 8,
185+ 82, 5, 200, 20,
186+ 78, 6, 190, 15,
187+ 0,
188+ 0x5C0A09D,
189+ },
190+ {
191+#ifdef JP
192+ "ハーフオーガ",
193+#endif
194+ "Half-Ogre",
195+
196+ { 3, -2, 0, -1, 3, -2 },
197+ -3, -5, -3, -2, -1, 5, 20, 0,
198+ 12, 145,
199+ 40, 10,
200+ 92, 10, 255, 60,
201+ 80, 8, 235, 60,
202+ 3,
203+ 0x0A80407,
204+ },
205+ {
206+#ifdef JP
207+ "半巨人",
208+#endif
209+ "Half-Giant",
210+
211+ { 4, -2, -2, -2, 3, -2 },
212+ -6, -8, -3, -2, -1, 5, 25, 5,
213+ 13, 160,
214+ 40, 10,
215+ 100,10, 255, 65,
216+ 80, 10, 240, 64,
217+ 3,
218+ 0x8880011,
219+ },
220+ {
221+#ifdef JP
222+ "半タイタン",
223+#endif
224+ "Half-Titan",
225+
226+ { 5, 1, 2, -2, 3, 1 },
227+ -5, 5, 1, -2, 1, 8, 25, 0,
228+ 14, 255,
229+ 100,30,
230+ 111, 11, 255, 86,
231+ 99, 11, 250, 86,
232+ 0,
233+ 0x23D4727,
234+ },
235+ {
236+#ifdef JP
237+ "サイクロプス",
238+#endif
239+ "Cyclops",
240+
241+ { 4, -3, -2, -3, 4, -3 },
242+ -4, -5, -3, -2, -2, 5, 20, 12,
243+ 13, 150,
244+ 50, 24,
245+ 92, 10, 255, 60,
246+ 80, 8, 235, 60,
247+ 1,
248+ 0x0888005,
249+ },
250+ {
251+#ifdef JP
252+ "イーク",
253+#endif
254+ "Yeek",
255+
256+ { -2, 1, 1, 1, -2, -4 },
257+ 2, 4, 6, 3, 5, 15, -5, -5,
258+ 7, 100,
259+ 14, 3,
260+ 50, 3, 90, 6,
261+ 50, 3, 75, 3,
262+ 2,
263+ 0x667360F,
264+ },
265+ {
266+#ifdef JP
267+ "クラッコン",
268+#endif
269+ "Klackon",
270+
271+ { 2, -1, -1, 1, 2, -1 },
272+ 10, 5, 3, 0, -1, 10, 5, 5,
273+ 12, 190,
274+ 20, 3,
275+ 60, 3, 80, 4,
276+ 54, 3, 70, 4,
277+ 2,
278+ 0x04D8011,
279+ },
280+ {
281+#ifdef JP
282+ "コボルド",
283+#endif
284+ "Kobold",
285+
286+ { 1, -1, 0, 1, 0, -2 },
287+ -2, -3, -1, -1, 1, 8, 10, -8,
288+ 9, 125,
289+ 11, 3,
290+ 60, 1, 130, 5,
291+ 55, 1, 100, 5,
292+ 3,
293+ 0x444A009,
294+ },
295+ {
296+#ifdef JP
297+ "ニーベルング",
298+#endif
299+ "Nibelung",
300+
301+ { 1, -1, 2, 0, 2, -2 },
302+ 3, 5, 6, 1, 5, 10, 9, 0,
303+ 11, 170,
304+ 40, 12,
305+ 43, 3, 92, 6,
306+ 40, 3, 78, 3,
307+ 5,
308+ 0x569040F,
309+ },
310+ {
311+#ifdef JP
312+ "ダークエルフ",
313+#endif
314+ "Dark-Elf",
315+
316+ { -1, 3, 2, 2, -2, 1 },
317+ 5, 10, 12, 3, 8, 12, -5, 10,
318+ 9, 150,
319+ 75, 75,
320+ 60, 4, 100, 6,
321+ 54, 4, 80, 6,
322+ 5,
323+ 0xE77C7DF,
324+ },
325+ {
326+#ifdef JP
327+ "ドラコニアン",
328+#endif
329+ "Draconian",
330+
331+ { 2, 1, 1, 1, 2, -1 },
332+ -2, 5, 2, 0, 1, 10, 5, 5,
333+ 11, 220,
334+ 75, 33,
335+ 76, 1, 160, 5,
336+ 72, 1, 130, 5,
337+ 2,
338+ 0x7FFE757,
339+ },
340+ {
341+#ifdef JP
342+ "マインドフレア",
343+#endif
344+ "Mindflayer",
345+
346+ { -3, 4, 4, 0, -2, -3 },
347+ 10, 15, 9, 2, 5, 12, -10, -5,
348+ 9, 140,
349+ 100, 25,
350+ 68, 6, 142, 15,
351+ 63, 6, 112, 10,
352+ 4,
353+ 0x2334746,
354+ },
355+ {
356+#ifdef JP
357+ "インプ",
358+#endif
359+ "Imp",
360+
361+ { 0, -1, -1, 1, 2, -1 },
362+ -3, 2, -1, 1, -1, 10, 5, -5,
363+ 10, 115,
364+ 13, 4,
365+ 68, 1, 150, 5,
366+ 64, 1, 120, 5,
367+ 3,
368+ 0xDB537CB,
369+ },
370+ {
371+#ifdef JP
372+ "ゴーレム",
373+#endif
374+ "Golem",
375+
376+ { 4, -5, -5, -2, 4, -2 },
377+ -5, -5, 6, -1, -1, 8, 20, 0,
378+ 12, 200,
379+ 1, 100,
380+ 66, 1, 200, 6,
381+ 62, 1, 180, 6,
382+ 4,
383+ 0x0800001,
384+ },
385+ {
386+#ifdef JP
387+ "骸骨",
388+#endif
389+ "Skeleton",
390+
391+ { 0, 1, -2, 0, 1, -2 },
392+ -5, 0, 3, -1, -1, 8, 10, 0,
393+ 10, 145,
394+ 100, 35,
395+ 72, 6, 50, 5,
396+ 66, 4, 50, 5,
397+ 2,
398+ 0x234070F,
399+ },
400+ {
401+#ifdef JP
402+ "ゾンビ",
403+#endif
404+ "Zombie",
405+
406+ { 2, -6, -6, 1, 4, -3 },
407+ -5, -5, 5, -1, -1, 5, 15, 0,
408+ 13, 150,
409+ 100, 30,
410+ 72, 6, 100, 25,
411+ 66, 4, 100, 20,
412+ 2,
413+ 0x0800001,
414+ },
415+ {
416+#ifdef JP
417+ "吸血鬼",
418+#endif
419+ "Vampire",
420+
421+ { 3, 3, -1, -1, 1, 2 },
422+ 4, 8, 6, 4, 1, 8, 5, 0,
423+ 11, 200,
424+ 100, 30,
425+ 72, 6, 180, 25,
426+ 66, 4, 150, 20,
427+ 5,
428+ 0x67DC7FF,
429+ },
430+ {
431+#ifdef JP
432+ "幽霊",
433+#endif
434+ "Spectre",
435+
436+ { -5, 4, -1, 2, 0, -3 },
437+ 10, 15, 12, 5, 5, 14, -15, -5,
438+ 7, 210,
439+ 100, 30,
440+ 72, 6, 100, 25,
441+ 66, 4, 100, 20,
442+ 5,
443+ 0x631474A,
444+ },
445+ {
446+#ifdef JP
447+ "妖精",
448+#endif
449+ "Sprite",
450+
451+ { -4, 3, 3, 3, -2, 2 },
452+ 10, 8, 6, 4, 10, 10, -12, 0,
453+ 7, 145,
454+ 50, 25,
455+ 32, 2, 75, 2,
456+ 29, 2, 65, 2,
457+ 4,
458+ 0x623F65E,
459+ },
460+ {
461+#ifdef JP
462+ "獣人",
463+#endif
464+ "Beastman",
465+
466+ { 2, -2, -1, -1, 2, -2 },
467+ -5, -2, -1, -1, -1, 5, 12, 5,
468+ 11, 140,
469+ 14, 6,
470+ 65, 6, 150, 20,
471+ 61, 6, 120, 15,
472+ 0,
473+ 0x57887CF,
474+ },
475+ {
476+#ifdef JP
477+ "エント",
478+#endif
479+ "Ent",
480+ { 2, 0, 2, -3, 2, 0 },
481+ -5, 2, 5, -1, 0, 9, 15, -5,
482+ 12, 140,
483+ 120, 60,
484+ 111, 11, 255, 50,
485+ 99, 11, 250, 45,
486+ 0,
487+ 0x0010005,
488+ },
489+ {
490+#ifdef JP
491+ "アルコン",
492+#endif
493+ "Archon",
494+
495+ { 2, 0, 4, 1, 2, 3 },
496+ 0, 12, 8, 2, 2, 11, 10, 10,
497+ 11, 235,
498+ 150, 150,
499+ 82, 5, 190, 20,
500+ 78, 6, 180, 15,
501+ 3,
502+ 0x779F777,
503+ },
504+ {
505+#ifdef JP
506+ "バルログ",
507+ "Balrog",
508+#else
509+ "Balrog",
510+#endif
511+
512+ { 4, 2, -10, 2, 3, -5 },
513+ -3, 12, 15, -2, 1, 8, 20, 0,
514+ 12, 250,
515+ 255, 255,
516+ 100,10, 255, 65,
517+ 80, 10, 240, 64,
518+ 5,
519+ 0x7EDC4DB,
520+ },
521+ {
522+#ifdef JP
523+ "ドゥナダン",
524+#endif
525+ "Dunadan",
526+
527+ { 1, 2, 2, 2, 3, 2 },
528+ 4, 5, 3, 2, 3, 13, 15, 10,
529+ 10, 180,
530+ 50, 20,
531+ 82, 5, 190, 20,
532+ 78, 6, 180, 15,
533+ 0,
534+ 0xFFFF7FF,
535+ },
536+ {
537+#ifdef JP
538+ "影フェアリー",
539+#endif
540+ "Shadow-Fairy",
541+ {-2, 2, 2, 1, -1, 0 },
542+ 7, 8, 0, 6, 12, 15, -10, -5,
543+ 7, 120,
544+ 200, 100,
545+ 80, 8, 90, 20,
546+ 73, 8, 80, 15,
547+ 4,
548+ 0xE33C7DF,
549+ },
550+ {
551+#ifdef JP
552+ "クター",
553+#endif
554+ "Kutar",
555+
556+ { 0, -1, -1, 1, 2, 3 },
557+ -2, 5, 5, 5, -2, 6, 0, -5,
558+ 11, 140,
559+ 14, 6,
560+ 48, 6, 150, 25,
561+ 44, 4, 130, 20,
562+ 0,
563+ 0xC18B7AD,
564+ },
565+ {
566+#ifdef JP
567+ "アンドロイド",
568+#endif
569+ "Android",
570+
571+ { 4, -5, -5, 0, 4, -2 },
572+ 0, -5, 0, -2, 3, 14, 20, 10,
573+ 13, 200,
574+ 1, 100,
575+ 72, 12, 240, 64,
576+ 66, 12, 220, 64,
577+ 0,
578+ 0x0800001,
579+ },
580+ {
581+#ifdef JP
582+ "マーフォーク",
583+#endif
584+ "Merfolk",
585+
586+ { -1, 0, 2, 1, -1, 1},
587+ 2, 3, 2, 1, 6, 11, -1, 5,
588+ 10, 130,
589+ 24, 16,
590+ 66, 6, 130, 15,
591+ 62, 6, 100, 10,
592+ 2,
593+ 0xE77E7FF,
594+ },
595+
596+};
597+
598+/*!
599+ * @brief 変身種族情報
600+ */
601+const player_race mimic_info[] =
602+{
603+ {
604+#ifdef JP
605+ "[標準形態]",
606+#endif
607+ "Default",
608+
609+ { 0, 0, 0, 0, 0, 0 },
610+ 0, 0, 0, 0, 0, 10, 0, 0,
611+ 10, 100,
612+ 0, 0,
613+ 0, 0, 0, 0,
614+ 0, 0, 0, 0,
615+ 0,
616+ 0x000000,
617+ },
618+ {
619+#ifdef JP
620+ "[悪魔]",
621+#endif
622+ "[Demon]",
623+
624+ { 5, 3, 2, 3, 4, -6 },
625+ -5, 18, 20, -2, 3, 10, 40, 20,
626+ 12, 0,
627+ 0, 0,
628+ 0, 0, 0, 0,
629+ 0, 0, 0, 0,
630+ 5,
631+ 0x000003,
632+ },
633+ {
634+#ifdef JP
635+ "[魔王]",
636+#endif
637+ "[Demon lord]",
638+
639+ { 20, 20, 20, 20, 20, 20 },
640+ 20, 20, 25, -2, 3, 10, 70, 40,
641+ 14, 0,
642+ 0, 0,
643+ 0, 0, 0, 0,
644+ 0, 0, 0, 0,
645+ 20,
646+ 0x000003,
647+ },
648+ {
649+#ifdef JP
650+ "[吸血鬼]",
651+#endif
652+ "[Vampire]",
653+
654+ { 4, 4, 1, 1, 2, 3 },
655+ 6, 12, 8, 6, 2, 12, 30, 20,
656+ 11, 0,
657+ 0, 0,
658+ 0, 0, 0, 0,
659+ 0, 0, 0, 0,
660+ 5,
661+ 0x000005,
662+ },
663+};
664+
665+const player_race *rp_ptr;
--- /dev/null
+++ b/src/player-race.h
@@ -0,0 +1,54 @@
1+#pragma once
2+
3+
4+
5+/*
6+ * Player racial info
7+ */
8+
9+typedef struct player_race player_race;
10+
11+struct player_race
12+{
13+ concptr title; /* Type of race */
14+
15+#ifdef JP
16+ concptr E_title; /* 英語種族 */
17+#endif
18+ s16b r_adj[6]; /* Racial stat bonuses */
19+
20+ s16b r_dis; /* disarming */
21+ s16b r_dev; /* magic devices */
22+ s16b r_sav; /* saving throw */
23+ s16b r_stl; /* stealth */
24+ s16b r_srh; /* search ability */
25+ s16b r_fos; /* search frequency */
26+ s16b r_thn; /* combat (normal) */
27+ s16b r_thb; /* combat (shooting) */
28+
29+ byte r_mhp; /* Race hit-dice modifier */
30+ byte r_exp; /* Race experience factor */
31+
32+ byte b_age; /* base age */
33+ byte m_age; /* mod age */
34+
35+ byte m_b_ht; /* base height (males) */
36+ byte m_m_ht; /* mod height (males) */
37+ byte m_b_wt; /* base weight (males) */
38+ byte m_m_wt; /* mod weight (males) */
39+
40+ byte f_b_ht; /* base height (females) */
41+ byte f_m_ht; /* mod height (females) */
42+ byte f_b_wt; /* base weight (females) */
43+ byte f_m_wt; /* mod weight (females) */
44+
45+ byte infra; /* Infra-vision range */
46+
47+ u32b choice; /* Legal class choices */
48+/* byte choice_xtra; */
49+};
50+
51+extern const player_race *rp_ptr;
52+
53+extern const player_race race_info[MAX_RACES];
54+extern const player_race mimic_info[];
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5,6 +5,8 @@
55 #include "player-status.h"
66 #include "player-effects.h"
77 #include "player-skill.h"
8+#include "player-race.h"
9+#include "player-class.h"
810 #include "floor.h"
911 #include "floor-events.h"
1012 #include "feature.h"
@@ -23,7 +25,6 @@
2325 #include "cmd-pet.h"
2426 #include "cmd-spell.h"
2527 #include "dungeon.h"
26-#include "player-class.h"
2728 #include "objectkind.h"
2829 #include "monsterrace.h"
2930 #include "autopick.h"
--- a/src/report.c
+++ b/src/report.c
@@ -12,6 +12,7 @@
1212 #include "floor.h"
1313 #include "player-status.h"
1414 #include "player-class.h"
15+#include "player-race.h"
1516 #include "files.h"
1617 #include "world.h"
1718
--- a/src/scores.c
+++ b/src/scores.c
@@ -13,6 +13,7 @@
1313 #include "angband.h"
1414 #include "util.h"
1515
16+#include "player-race.h"
1617 #include "player-status.h"
1718 #include "player-class.h"
1819 #include "files.h"
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -21,6 +21,7 @@
2121 #include "object-curse.h"
2222 #include "player-damage.h"
2323 #include "player-effects.h"
24+#include "player-race.h"
2425
2526 #include "monster.h"
2627 #include "monster-status.h"
--- a/src/store.c
+++ b/src/store.c
@@ -30,6 +30,7 @@
3030 #include "snipe.h"
3131 #include "files.h"
3232 #include "player-effects.h"
33+#include "player-race.h"
3334 #include "mind.h"
3435 #include "world.h"
3536 #include "objectkind.h"
--- a/src/tables.c
+++ b/src/tables.c
@@ -1285,599 +1285,6 @@ const player_sex sex_info[MAX_SEXES] =
12851285 }
12861286 };
12871287
1288-
1289-/*!
1290- * @brief 種族情報 /
1291- * Player Races
1292- * @details
1293- * <pre>
1294- * Title,
1295- * {STR,INT,WIS,DEX,CON,CHR},
1296- * r_dis, r_dev, r_sav, r_stl, r_srh, r_fos, r_thn, r_thb,
1297- * hitdie, exp base,
1298- * Age (Base, Mod),
1299- * Male (Hgt, Wgt),
1300- * Female (Hgt, Wgt)
1301- * infra,
1302- * class-choices
1303- * </pre>
1304- */
1305-const player_race race_info[MAX_RACES] =
1306-{
1307- {
1308-#ifdef JP
1309- "人間",
1310-#endif
1311- "Human",
1312-
1313- { 0, 0, 0, 0, 0, 0 },
1314- 0, 0, 0, 0, 0, 10, 0, 0,
1315- 10, 100,
1316- 14, 6,
1317- 72, 6, 180, 25,
1318- 66, 4, 150, 20,
1319- 0,
1320- 0xFFFFFFF,
1321- },
1322- {
1323-#ifdef JP
1324- "ハーフエルフ",
1325-#endif
1326- "Half-Elf",
1327-
1328- { -1, 1, 1, 1, -1, 1 },
1329- 2, 3, 2, 1, 6, 11, -1, 5,
1330- 9, 110,
1331- 24, 16,
1332- 66, 6, 130, 15,
1333- 62, 6, 100, 10,
1334- 2,
1335- 0xE77E7FF,
1336- },
1337- {
1338-#ifdef JP
1339- "エルフ",
1340-#endif
1341- "Elf",
1342-
1343- { -1, 2, 0, 1, -2, 2 },
1344- 5, 6, 4, 2, 8, 12, -5, 15,
1345- 8, 120,
1346- 75, 75,
1347- 60, 4, 100, 6,
1348- 54, 4, 80, 6,
1349- 3,
1350- 0xE77E75B,
1351-
1352- },
1353- {
1354-#ifdef JP
1355- "ホビット",
1356-#endif
1357- "Hobbit",
1358-
1359- { -2, 1, 1, 3, 2, 1 },
1360- 15, 12, 10, 5, 12, 15, -10, 20,
1361- 7, 110,
1362- 21, 12,
1363- 36, 3, 60, 3,
1364- 33, 3, 50, 3,
1365- 4,
1366- 0xF6FFC0B,
1367- },
1368- {
1369-#ifdef JP
1370- "ノーム",
1371-#endif
1372- "Gnome",
1373-
1374- { -1, 2, 0, 2, 1, -1 },
1375- 10, 8, 7, 3, 6, 13, -8, 12,
1376- 8, 120,
1377- 50, 40,
1378- 42, 3, 90, 6,
1379- 39, 3, 75, 3,
1380- 4,
1381- 0xF67D60F,
1382- },
1383- {
1384-#ifdef JP
1385- "ドワーフ",
1386-#endif
1387- "Dwarf",
1388-
1389- { 2, -2, 2, -2, 2, -1 },
1390- 2, 7, 6, -1, 7, 10, 15, 0,
1391- 11, 125,
1392- 35, 15,
1393- 48, 3, 150, 10,
1394- 46, 3, 120, 10,
1395- 5,
1396- 0x1890005,
1397- },
1398- {
1399-#ifdef JP
1400- "ハーフオーク",
1401-#endif
1402- "Half-Orc",
1403-
1404- { 2, -1, 0, 0, 1, -2 },
1405- -3, -3, -2, -1, 0, 7, 12, -5,
1406- 10, 110,
1407- 11, 4,
1408- 66, 1, 150, 5,
1409- 62, 1, 120, 5,
1410- 3,
1411- 0xDD8818D,
1412- },
1413- {
1414-#ifdef JP
1415- "ハーフトロル",
1416-#endif
1417- "Half-Troll",
1418-
1419- { 4, -4, -1, -3, 3, -3 },
1420- -5, -8, -5, -2, -1, 5, 20, -10,
1421- 12, 125,
1422- 20, 10,
1423- 96, 10, 250, 50,
1424- 84, 8, 225, 40,
1425- 3,
1426- 0x0880005,
1427- },
1428- {
1429-#ifdef JP
1430- "アンバライト",
1431-#endif
1432- "Amberite",
1433-
1434- { 1, 2, 2, 2, 3, 2 },
1435- 4, 5, 3, 2, 3, 13, 15, 10,
1436- 10, 225,
1437- 50, 50,
1438- 82, 5, 190, 20,
1439- 78, 6, 180, 15,
1440- 0,
1441- 0xFFFF7FF,
1442- },
1443- {
1444-#ifdef JP
1445- "ハイエルフ",
1446-#endif
1447- "High-Elf",
1448-
1449- { 1, 3, -1, 3, 1, 3 },
1450- 4, 13, 12, 4, 3, 14, 10, 25,
1451- 10, 200,
1452- 100, 30,
1453- 90, 10, 190, 20,
1454- 82, 10, 180, 15,
1455- 4,
1456- 0xF77E75B,
1457- },
1458- {
1459-#ifdef JP
1460- "野蛮人",
1461-#endif
1462- "Barbarian",
1463-
1464- { 3, -2, -1, 1, 2, 0 },
1465- -2, -10, 2, -1, 1, 7, 12, 10,
1466- 11, 120,
1467- 14, 8,
1468- 82, 5, 200, 20,
1469- 78, 6, 190, 15,
1470- 0,
1471- 0x5C0A09D,
1472- },
1473- {
1474-#ifdef JP
1475- "ハーフオーガ",
1476-#endif
1477- "Half-Ogre",
1478-
1479- { 3, -2, 0, -1, 3, -2 },
1480- -3, -5, -3, -2, -1, 5, 20, 0,
1481- 12, 145,
1482- 40, 10,
1483- 92, 10, 255, 60,
1484- 80, 8, 235, 60,
1485- 3,
1486- 0x0A80407,
1487- },
1488- {
1489-#ifdef JP
1490- "半巨人",
1491-#endif
1492- "Half-Giant",
1493-
1494- { 4, -2, -2, -2, 3, -2 },
1495- -6, -8, -3, -2, -1, 5, 25, 5,
1496- 13, 160,
1497- 40, 10,
1498- 100,10, 255, 65,
1499- 80, 10, 240, 64,
1500- 3,
1501- 0x8880011,
1502- },
1503- {
1504-#ifdef JP
1505- "半タイタン",
1506-#endif
1507- "Half-Titan",
1508-
1509- { 5, 1, 2, -2, 3, 1 },
1510- -5, 5, 1, -2, 1, 8, 25, 0,
1511- 14, 255,
1512- 100,30,
1513- 111, 11, 255, 86,
1514- 99, 11, 250, 86,
1515- 0,
1516- 0x23D4727,
1517- },
1518- {
1519-#ifdef JP
1520- "サイクロプス",
1521-#endif
1522- "Cyclops",
1523-
1524- { 4, -3, -2, -3, 4, -3 },
1525- -4, -5, -3, -2, -2, 5, 20, 12,
1526- 13, 150,
1527- 50, 24,
1528- 92, 10, 255, 60,
1529- 80, 8, 235, 60,
1530- 1,
1531- 0x0888005,
1532- },
1533- {
1534-#ifdef JP
1535- "イーク",
1536-#endif
1537- "Yeek",
1538-
1539- { -2, 1, 1, 1, -2, -4 },
1540- 2, 4, 6, 3, 5, 15, -5, -5,
1541- 7, 100,
1542- 14, 3,
1543- 50, 3, 90, 6,
1544- 50, 3, 75, 3,
1545- 2,
1546- 0x667360F,
1547- },
1548- {
1549-#ifdef JP
1550- "クラッコン",
1551-#endif
1552- "Klackon",
1553-
1554- { 2, -1, -1, 1, 2, -1 },
1555- 10, 5, 3, 0, -1, 10, 5, 5,
1556- 12, 190,
1557- 20, 3,
1558- 60, 3, 80, 4,
1559- 54, 3, 70, 4,
1560- 2,
1561- 0x04D8011,
1562- },
1563- {
1564-#ifdef JP
1565- "コボルド",
1566-#endif
1567- "Kobold",
1568-
1569- { 1, -1, 0, 1, 0, -2 },
1570- -2, -3, -1, -1, 1, 8, 10, -8,
1571- 9, 125,
1572- 11, 3,
1573- 60, 1, 130, 5,
1574- 55, 1, 100, 5,
1575- 3,
1576- 0x444A009,
1577- },
1578- {
1579-#ifdef JP
1580- "ニーベルング",
1581-#endif
1582- "Nibelung",
1583-
1584- { 1, -1, 2, 0, 2, -2 },
1585- 3, 5, 6, 1, 5, 10, 9, 0,
1586- 11, 170,
1587- 40, 12,
1588- 43, 3, 92, 6,
1589- 40, 3, 78, 3,
1590- 5,
1591- 0x569040F,
1592- },
1593- {
1594-#ifdef JP
1595- "ダークエルフ",
1596-#endif
1597- "Dark-Elf",
1598-
1599- { -1, 3, 2, 2, -2, 1 },
1600- 5, 10, 12, 3, 8, 12, -5, 10,
1601- 9, 150,
1602- 75, 75,
1603- 60, 4, 100, 6,
1604- 54, 4, 80, 6,
1605- 5,
1606- 0xE77C7DF,
1607- },
1608- {
1609-#ifdef JP
1610- "ドラコニアン",
1611-#endif
1612- "Draconian",
1613-
1614- { 2, 1, 1, 1, 2, -1 },
1615- -2, 5, 2, 0, 1, 10, 5, 5,
1616- 11, 220,
1617- 75, 33,
1618- 76, 1, 160, 5,
1619- 72, 1, 130, 5,
1620- 2,
1621- 0x7FFE757,
1622- },
1623- {
1624-#ifdef JP
1625- "マインドフレア",
1626-#endif
1627- "Mindflayer",
1628-
1629- { -3, 4, 4, 0, -2, -3 },
1630- 10, 15, 9, 2, 5, 12, -10, -5,
1631- 9, 140,
1632- 100, 25,
1633- 68, 6, 142, 15,
1634- 63, 6, 112, 10,
1635- 4,
1636- 0x2334746,
1637- },
1638- {
1639-#ifdef JP
1640- "インプ",
1641-#endif
1642- "Imp",
1643-
1644- { 0, -1, -1, 1, 2, -1 },
1645- -3, 2, -1, 1, -1, 10, 5, -5,
1646- 10, 115,
1647- 13, 4,
1648- 68, 1, 150, 5,
1649- 64, 1, 120, 5,
1650- 3,
1651- 0xDB537CB,
1652- },
1653- {
1654-#ifdef JP
1655- "ゴーレム",
1656-#endif
1657- "Golem",
1658-
1659- { 4, -5, -5, -2, 4, -2 },
1660- -5, -5, 6, -1, -1, 8, 20, 0,
1661- 12, 200,
1662- 1, 100,
1663- 66, 1, 200, 6,
1664- 62, 1, 180, 6,
1665- 4,
1666- 0x0800001,
1667- },
1668- {
1669-#ifdef JP
1670- "骸骨",
1671-#endif
1672- "Skeleton",
1673-
1674- { 0, 1, -2, 0, 1, -2 },
1675- -5, 0, 3, -1, -1, 8, 10, 0,
1676- 10, 145,
1677- 100, 35,
1678- 72, 6, 50, 5,
1679- 66, 4, 50, 5,
1680- 2,
1681- 0x234070F,
1682- },
1683- {
1684-#ifdef JP
1685- "ゾンビ",
1686-#endif
1687- "Zombie",
1688-
1689- { 2, -6, -6, 1, 4, -3 },
1690- -5, -5, 5, -1, -1, 5, 15, 0,
1691- 13, 150,
1692- 100, 30,
1693- 72, 6, 100, 25,
1694- 66, 4, 100, 20,
1695- 2,
1696- 0x0800001,
1697- },
1698- {
1699-#ifdef JP
1700- "吸血鬼",
1701-#endif
1702- "Vampire",
1703-
1704- { 3, 3, -1, -1, 1, 2 },
1705- 4, 8, 6, 4, 1, 8, 5, 0,
1706- 11, 200,
1707- 100, 30,
1708- 72, 6, 180, 25,
1709- 66, 4, 150, 20,
1710- 5,
1711- 0x67DC7FF,
1712- },
1713- {
1714-#ifdef JP
1715- "幽霊",
1716-#endif
1717- "Spectre",
1718-
1719- { -5, 4, -1, 2, 0, -3 },
1720- 10, 15, 12, 5, 5, 14, -15, -5,
1721- 7, 210,
1722- 100, 30,
1723- 72, 6, 100, 25,
1724- 66, 4, 100, 20,
1725- 5,
1726- 0x631474A,
1727- },
1728- {
1729-#ifdef JP
1730- "妖精",
1731-#endif
1732- "Sprite",
1733-
1734- { -4, 3, 3, 3, -2, 2 },
1735- 10, 8, 6, 4, 10, 10, -12, 0,
1736- 7, 145,
1737- 50, 25,
1738- 32, 2, 75, 2,
1739- 29, 2, 65, 2,
1740- 4,
1741- 0x623F65E,
1742- },
1743- {
1744-#ifdef JP
1745- "獣人",
1746-#endif
1747- "Beastman",
1748-
1749- { 2, -2, -1, -1, 2, -2 },
1750- -5, -2, -1, -1, -1, 5, 12, 5,
1751- 11, 140,
1752- 14, 6,
1753- 65, 6, 150, 20,
1754- 61, 6, 120, 15,
1755- 0,
1756- 0x57887CF,
1757- },
1758- {
1759-#ifdef JP
1760- "エント",
1761-#endif
1762- "Ent",
1763- { 2, 0, 2, -3, 2, 0 },
1764- -5, 2, 5, -1, 0, 9, 15, -5,
1765- 12, 140,
1766- 120, 60,
1767- 111, 11, 255, 50,
1768- 99, 11, 250, 45,
1769- 0,
1770- 0x0010005,
1771- },
1772- {
1773-#ifdef JP
1774- "アルコン",
1775-#endif
1776- "Archon",
1777-
1778- { 2, 0, 4, 1, 2, 3 },
1779- 0, 12, 8, 2, 2, 11, 10, 10,
1780- 11, 235,
1781- 150, 150,
1782- 82, 5, 190, 20,
1783- 78, 6, 180, 15,
1784- 3,
1785- 0x779F777,
1786- },
1787- {
1788-#ifdef JP
1789- "バルログ",
1790- "Balrog",
1791-#else
1792- "Balrog",
1793-#endif
1794-
1795- { 4, 2, -10, 2, 3, -5 },
1796- -3, 12, 15, -2, 1, 8, 20, 0,
1797- 12, 250,
1798- 255, 255,
1799- 100,10, 255, 65,
1800- 80, 10, 240, 64,
1801- 5,
1802- 0x7EDC4DB,
1803- },
1804- {
1805-#ifdef JP
1806- "ドゥナダン",
1807-#endif
1808- "Dunadan",
1809-
1810- { 1, 2, 2, 2, 3, 2 },
1811- 4, 5, 3, 2, 3, 13, 15, 10,
1812- 10, 180,
1813- 50, 20,
1814- 82, 5, 190, 20,
1815- 78, 6, 180, 15,
1816- 0,
1817- 0xFFFF7FF,
1818- },
1819- {
1820-#ifdef JP
1821- "影フェアリー",
1822-#endif
1823- "Shadow-Fairy",
1824- {-2, 2, 2, 1, -1, 0 },
1825- 7, 8, 0, 6, 12, 15, -10, -5,
1826- 7, 120,
1827- 200, 100,
1828- 80, 8, 90, 20,
1829- 73, 8, 80, 15,
1830- 4,
1831- 0xE33C7DF,
1832- },
1833- {
1834-#ifdef JP
1835- "クター",
1836-#endif
1837- "Kutar",
1838-
1839- { 0, -1, -1, 1, 2, 3 },
1840- -2, 5, 5, 5, -2, 6, 0, -5,
1841- 11, 140,
1842- 14, 6,
1843- 48, 6, 150, 25,
1844- 44, 4, 130, 20,
1845- 0,
1846- 0xC18B7AD,
1847- },
1848- {
1849-#ifdef JP
1850- "アンドロイド",
1851-#endif
1852- "Android",
1853-
1854- { 4, -5, -5, 0, 4, -2 },
1855- 0, -5, 0, -2, 3, 14, 20, 10,
1856- 13, 200,
1857- 1, 100,
1858- 72, 12, 240, 64,
1859- 66, 12, 220, 64,
1860- 0,
1861- 0x0800001,
1862- },
1863- {
1864-#ifdef JP
1865- "マーフォーク",
1866-#endif
1867- "Merfolk",
1868-
1869- { -1, 0, 2, 1, -1, 1},
1870- 2, 3, 2, 1, 6, 11, -1, 5,
1871- 10, 130,
1872- 24, 16,
1873- 66, 6, 130, 15,
1874- 62, 6, 100, 10,
1875- 2,
1876- 0xE77E7FF,
1877- },
1878-
1879-};
1880-
18811288 /*!
18821289 * @brief 性格情報 /
18831290 * Player Character
@@ -2018,74 +1425,6 @@ const player_seikaku seikaku_info[MAX_SEIKAKU] =
20181425
20191426
20201427 /*!
2021- * @brief 変身種族情報
2022- */
2023-const player_race mimic_info[] =
2024-{
2025- {
2026-#ifdef JP
2027- "[標準形態]",
2028-#endif
2029- "Default",
2030-
2031- { 0, 0, 0, 0, 0, 0 },
2032- 0, 0, 0, 0, 0, 10, 0, 0,
2033- 10, 100,
2034- 0, 0,
2035- 0, 0, 0, 0,
2036- 0, 0, 0, 0,
2037- 0,
2038- 0x000000,
2039- },
2040- {
2041-#ifdef JP
2042- "[悪魔]",
2043-#endif
2044- "[Demon]",
2045-
2046- { 5, 3, 2, 3, 4, -6 },
2047- -5, 18, 20, -2, 3, 10, 40, 20,
2048- 12, 0,
2049- 0, 0,
2050- 0, 0, 0, 0,
2051- 0, 0, 0, 0,
2052- 5,
2053- 0x000003,
2054- },
2055- {
2056-#ifdef JP
2057- "[魔王]",
2058-#endif
2059- "[Demon lord]",
2060-
2061- { 20, 20, 20, 20, 20, 20 },
2062- 20, 20, 25, -2, 3, 10, 70, 40,
2063- 14, 0,
2064- 0, 0,
2065- 0, 0, 0, 0,
2066- 0, 0, 0, 0,
2067- 20,
2068- 0x000003,
2069- },
2070- {
2071-#ifdef JP
2072- "[吸血鬼]",
2073-#endif
2074- "[Vampire]",
2075-
2076- { 4, 4, 1, 1, 2, 3 },
2077- 6, 12, 8, 6, 2, 12, 30, 20,
2078- 11, 0,
2079- 0, 0,
2080- 0, 0, 0, 0,
2081- 0, 0, 0, 0,
2082- 5,
2083- 0x000005,
2084- },
2085-};
2086-
2087-
2088-/*!
20891428 * 魔法領域フラグ管理テーブル /
20901429 * Zangband uses this array instead of the spell flags table, as there
20911430 * are 5 realms of magic, each with 4 spellbooks and 8 spells per book -- TY
--- a/src/types.h
+++ b/src/types.h
@@ -92,54 +92,6 @@ struct player_sex
9292 #endif
9393 };
9494
95-
96-/*
97- * Player racial info
98- */
99-
100-typedef struct player_race player_race;
101-
102-struct player_race
103-{
104- concptr title; /* Type of race */
105-
106-#ifdef JP
107- concptr E_title; /* 英語種族 */
108-#endif
109- s16b r_adj[6]; /* Racial stat bonuses */
110-
111- s16b r_dis; /* disarming */
112- s16b r_dev; /* magic devices */
113- s16b r_sav; /* saving throw */
114- s16b r_stl; /* stealth */
115- s16b r_srh; /* search ability */
116- s16b r_fos; /* search frequency */
117- s16b r_thn; /* combat (normal) */
118- s16b r_thb; /* combat (shooting) */
119-
120- byte r_mhp; /* Race hit-dice modifier */
121- byte r_exp; /* Race experience factor */
122-
123- byte b_age; /* base age */
124- byte m_age; /* mod age */
125-
126- byte m_b_ht; /* base height (males) */
127- byte m_m_ht; /* mod height (males) */
128- byte m_b_wt; /* base weight (males) */
129- byte m_m_wt; /* mod weight (males) */
130-
131- byte f_b_ht; /* base height (females) */
132- byte f_m_ht; /* mod height (females) */
133- byte f_b_wt; /* base weight (females) */
134- byte f_m_wt; /* mod weight (females) */
135-
136- byte infra; /* Infra-vision range */
137-
138- u32b choice; /* Legal class choices */
139-/* byte choice_xtra; */
140-};
141-
142-
14395 typedef struct player_seikaku player_seikaku;
14496 struct player_seikaku
14597 {
--- a/src/variable.c
+++ b/src/variable.c
@@ -452,7 +452,6 @@ player_type *p_ptr = &p_body;
452452 * (sex, race, class, magic)
453453 */
454454 const player_sex *sp_ptr;
455-const player_race *rp_ptr;
456455 const player_seikaku *ap_ptr;
457456
458457
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -21,6 +21,7 @@
2121 #include "avatar.h"
2222 #include "player-status.h"
2323 #include "player-class.h"
24+#include "player-race.h"
2425 #include "monster.h"
2526 #include "view-mainwindow.h"
2627
--- a/src/warning.c
+++ b/src/warning.c
@@ -14,6 +14,7 @@
1414 #include "spells.h"
1515 #include "object-flavor.h"
1616 #include "dungeon.h"
17+#include "player-race.h"
1718
1819 /*!
1920 * @brief 警告を放つアイテムを選択する /
Show on old repository browser