• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision73e11fad24922fbefcc139f854fffcda7de96334 (tree)
Time2019-06-01 13:17:14
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 種族定義IDを player-race.h へ移動.

Change Summary

Incremental Difference

--- a/src/avatar.c
+++ b/src/avatar.c
@@ -16,6 +16,7 @@
1616 #include "angband.h"
1717 #include "avatar.h"
1818 #include "realm.h"
19+#include "player-race.h"
1920
2021 /*!
2122 * 徳の名称 / The names of the virtues
--- a/src/bldg.h
+++ b/src/bldg.h
@@ -1,6 +1,7 @@
11 #pragma once
22
33 #include "realm.h"
4+#include "player-race.h"
45
56 #define MAX_BLDG 32 /*!< 施設の種類最大数 / Number of buildings */
67 #define MAX_ARENA_MONS 41 /*<! 闘技場のイベント件数 -KMW- */
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -31,6 +31,7 @@
3131 #include "grid.h"
3232 #include "targeting.h"
3333 #include "realm-song.h"
34+#include "player-race.h"
3435
3536 /*!
3637 * @brief 装備耐性に準じたブレス効果の選択テーブル /
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -44,6 +44,7 @@
4444 #include "autopick.h"
4545 #include "targeting.h"
4646 #include "snipe.h"
47+#include "player-race.h"
4748
4849 /*!
4950 * @brief 持ち物一覧を表示するコマンドのメインルーチン / Display p_ptr->inventory_list
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -1,6 +1,7 @@
11 #include "angband.h"
22 #include "util.h"
33
4+#include "player-race.h"
45 #include "spells-summon.h"
56 #include "avatar.h"
67 #include "player-status.h"
--- a/src/defines.h
+++ b/src/defines.h
@@ -180,53 +180,6 @@
180180 #define SEX_FEMALE 0
181181 #define SEX_MALE 1
182182
183-/*
184- * Player race constants (hard-coded by save-files, arrays, etc)
185- */
186-#define RACE_HUMAN 0
187-#define RACE_HALF_ELF 1
188-#define RACE_ELF 2
189-#define RACE_HOBBIT 3
190-#define RACE_GNOME 4
191-#define RACE_DWARF 5
192-#define RACE_HALF_ORC 6
193-#define RACE_HALF_TROLL 7
194-#define RACE_AMBERITE 8
195-#define RACE_HIGH_ELF 9
196-#define RACE_BARBARIAN 10
197-#define RACE_HALF_OGRE 11
198-#define RACE_HALF_GIANT 12
199-#define RACE_HALF_TITAN 13
200-#define RACE_CYCLOPS 14
201-#define RACE_YEEK 15
202-#define RACE_KLACKON 16
203-#define RACE_KOBOLD 17
204-#define RACE_NIBELUNG 18
205-#define RACE_DARK_ELF 19
206-#define RACE_DRACONIAN 20
207-#define RACE_MIND_FLAYER 21
208-#define RACE_IMP 22
209-#define RACE_GOLEM 23
210-#define RACE_SKELETON 24
211-#define RACE_ZOMBIE 25
212-#define RACE_VAMPIRE 26
213-#define RACE_SPECTRE 27
214-#define RACE_SPRITE 28
215-#define RACE_BEASTMAN 29
216-#define RACE_ENT 30
217-#define RACE_ANGEL 31
218-#define RACE_DEMON 32
219-#define RACE_DUNADAN 33
220-#define RACE_S_FAIRY 34
221-#define RACE_KUTAR 35
222-#define RACE_ANDROID 36
223-#define RACE_MERFOLK 37
224-
225-/*
226- * Maximum number of player "race" types (see "table.c", etc)
227- */
228-#define MAX_RACES 38
229-
230183
231184 /*
232185 * Player class constants (hard-coded by save-files, arrays, etc)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -30,6 +30,7 @@
3030 #include "files.h"
3131 #include "floor.h"
3232 #include "targeting.h"
33+#include "player-race.h"
3334
3435 /*!
3536 * @brief プレイヤーに突然変異を与える
--- a/src/patron.c
+++ b/src/patron.c
@@ -13,6 +13,7 @@
1313 #include "artifact.h"
1414 #include "player-status.h"
1515 #include "player-effects.h"
16+#include "player-race.h"
1617
1718 #include "spells.h"
1819 #include "spells-summon.h"
--- a/src/player-race.h
+++ b/src/player-race.h
@@ -1,6 +1,54 @@
11 #pragma once
22
33 /*
4+ * Player race constants (hard-coded by save-files, arrays, etc)
5+ */
6+#define RACE_HUMAN 0
7+#define RACE_HALF_ELF 1
8+#define RACE_ELF 2
9+#define RACE_HOBBIT 3
10+#define RACE_GNOME 4
11+#define RACE_DWARF 5
12+#define RACE_HALF_ORC 6
13+#define RACE_HALF_TROLL 7
14+#define RACE_AMBERITE 8
15+#define RACE_HIGH_ELF 9
16+#define RACE_BARBARIAN 10
17+#define RACE_HALF_OGRE 11
18+#define RACE_HALF_GIANT 12
19+#define RACE_HALF_TITAN 13
20+#define RACE_CYCLOPS 14
21+#define RACE_YEEK 15
22+#define RACE_KLACKON 16
23+#define RACE_KOBOLD 17
24+#define RACE_NIBELUNG 18
25+#define RACE_DARK_ELF 19
26+#define RACE_DRACONIAN 20
27+#define RACE_MIND_FLAYER 21
28+#define RACE_IMP 22
29+#define RACE_GOLEM 23
30+#define RACE_SKELETON 24
31+#define RACE_ZOMBIE 25
32+#define RACE_VAMPIRE 26
33+#define RACE_SPECTRE 27
34+#define RACE_SPRITE 28
35+#define RACE_BEASTMAN 29
36+#define RACE_ENT 30
37+#define RACE_ANGEL 31
38+#define RACE_DEMON 32
39+#define RACE_DUNADAN 33
40+#define RACE_S_FAIRY 34
41+#define RACE_KUTAR 35
42+#define RACE_ANDROID 36
43+#define RACE_MERFOLK 37
44+
45+ /*
46+ * Maximum number of player "race" types (see "table.c", etc)
47+ */
48+#define MAX_RACES 38
49+
50+
51+/*
452 * Constant for kinds of mimic
553 */
654 #define MIMIC_NONE 0
Show on old repository browser