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

diff --git a/src/avatar.c b/src/avatar.c
index c47c955..4fabcc2 100644 (file)
--- a/src/avatar.c
+++ b/src/avatar.c
@@ -16,6 +16,7 @@
 #include "angband.h"
 #include "avatar.h"
 #include "realm.h"
+#include "player-race.h"
 
 /*!
  * 徳の名称 / The names of the virtues

diff --git a/src/bldg.h b/src/bldg.h
index 4e2c9c2..ac091c5 100644 (file)
--- a/src/bldg.h
+++ b/src/bldg.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "realm.h"
+#include "player-race.h"
 
 #define MAX_BLDG 32 /*!< 施設の種類最大数 / Number of buildings */
 #define MAX_ARENA_MONS 41 /*<! 闘技場のイベント件数 -KMW- */

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index dd2f0be..337e49d 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -31,6 +31,7 @@
 #include "grid.h"
 #include "targeting.h"
 #include "realm-song.h"
+#include "player-race.h"
 
 /*!
  * @brief 装備耐性に準じたブレス効果の選択テーブル /

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 893aa7a..3dd50c7 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -44,6 +44,7 @@
 #include "autopick.h"
 #include "targeting.h"
 #include "snipe.h"
+#include "player-race.h"
 
 /*!
  * @brief 持ち物一覧を表示するコマンドのメインルーチン / Display p_ptr->inventory_list

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index cd9e5f8..7440e96 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "player-race.h"
 #include "spells-summon.h"
 #include "avatar.h"
 #include "player-status.h"

diff --git a/src/defines.h b/src/defines.h
index 584e369..698e3c7 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -180,53 +180,6 @@
 #define SEX_FEMALE              0
 #define SEX_MALE                1
 
-/*
- * Player race constants (hard-coded by save-files, arrays, etc)
- */
-#define RACE_HUMAN               0
-#define RACE_HALF_ELF            1
-#define RACE_ELF                 2
-#define RACE_HOBBIT              3
-#define RACE_GNOME               4
-#define RACE_DWARF               5
-#define RACE_HALF_ORC            6
-#define RACE_HALF_TROLL          7
-#define RACE_AMBERITE            8
-#define RACE_HIGH_ELF            9
-#define RACE_BARBARIAN          10
-#define RACE_HALF_OGRE          11
-#define RACE_HALF_GIANT         12
-#define RACE_HALF_TITAN         13
-#define RACE_CYCLOPS            14
-#define RACE_YEEK               15
-#define RACE_KLACKON            16
-#define RACE_KOBOLD             17
-#define RACE_NIBELUNG           18
-#define RACE_DARK_ELF           19
-#define RACE_DRACONIAN          20
-#define RACE_MIND_FLAYER        21
-#define RACE_IMP                22
-#define RACE_GOLEM              23
-#define RACE_SKELETON           24
-#define RACE_ZOMBIE             25
-#define RACE_VAMPIRE            26
-#define RACE_SPECTRE            27
-#define RACE_SPRITE             28
-#define RACE_BEASTMAN           29
-#define RACE_ENT                30
-#define RACE_ANGEL              31
-#define RACE_DEMON              32
-#define RACE_DUNADAN            33
-#define RACE_S_FAIRY            34
-#define RACE_KUTAR              35
-#define RACE_ANDROID            36
-#define RACE_MERFOLK            37
-
-/*
- * Maximum number of player "race" types (see "table.c", etc)
- */
-#define MAX_RACES               38
-
 
 /*
  * Player class constants (hard-coded by save-files, arrays, etc)

diff --git a/src/mutation.c b/src/mutation.c
index a2cbb47..9b2450a 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -30,6 +30,7 @@
 #include "files.h"
 #include "floor.h"
 #include "targeting.h"
+#include "player-race.h"
 
 /*!
  * @brief プレイヤーに突然変異を与える

diff --git a/src/patron.c b/src/patron.c
index 21a26d3..1b8d3e5 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -13,6 +13,7 @@
 #include "artifact.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "player-race.h"
 
 #include "spells.h"
 #include "spells-summon.h"

diff --git a/src/player-race.h b/src/player-race.h
index fd38b39..723b3b0 100644 (file)
--- a/src/player-race.h
+++ b/src/player-race.h
@@ -1,6 +1,54 @@
 #pragma once
 
 /*
+ * Player race constants (hard-coded by save-files, arrays, etc)
+ */
+#define RACE_HUMAN               0
+#define RACE_HALF_ELF            1
+#define RACE_ELF                 2
+#define RACE_HOBBIT              3
+#define RACE_GNOME               4
+#define RACE_DWARF               5
+#define RACE_HALF_ORC            6
+#define RACE_HALF_TROLL          7
+#define RACE_AMBERITE            8
+#define RACE_HIGH_ELF            9
+#define RACE_BARBARIAN          10
+#define RACE_HALF_OGRE          11
+#define RACE_HALF_GIANT         12
+#define RACE_HALF_TITAN         13
+#define RACE_CYCLOPS            14
+#define RACE_YEEK               15
+#define RACE_KLACKON            16
+#define RACE_KOBOLD             17
+#define RACE_NIBELUNG           18
+#define RACE_DARK_ELF           19
+#define RACE_DRACONIAN          20
+#define RACE_MIND_FLAYER        21
+#define RACE_IMP                22
+#define RACE_GOLEM              23
+#define RACE_SKELETON           24
+#define RACE_ZOMBIE             25
+#define RACE_VAMPIRE            26
+#define RACE_SPECTRE            27
+#define RACE_SPRITE             28
+#define RACE_BEASTMAN           29
+#define RACE_ENT                30
+#define RACE_ANGEL              31
+#define RACE_DEMON              32
+#define RACE_DUNADAN            33
+#define RACE_S_FAIRY            34
+#define RACE_KUTAR              35
+#define RACE_ANDROID            36
+#define RACE_MERFOLK            37
+
+ /*
+  * Maximum number of player "race" types (see "table.c", etc)
+  */
+#define MAX_RACES               38
+
+
+/*
  * Constant for kinds of mimic
  */
 #define MIMIC_NONE       0