[Refactor] #39077 IDX を MONSTER_IDX や MONRACE_IDX。

diff --git a/src/externs.h b/src/externs.h
index 2691c0d..c1622e8 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -646,9 +646,9 @@ extern bool set_monster_monfear(MONSTER_IDX m_idx, int v);
 extern bool set_monster_invulner(MONSTER_IDX m_idx, int v, bool energy_need);
 extern void process_monsters_mtimed(int mtimed_idx);
 extern void dispel_monster_status(MONSTER_IDX m_idx);
-extern void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, concptr note, IDX who);
+extern void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, concptr note, MONSTER_IDX who);
 extern bool process_the_world(int num, MONSTER_IDX who, bool vs_player);
-extern void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx);
+extern void monster_gain_exp(MONSTER_IDX m_idx, MONRACE_IDX s_idx);
 
 /* monster1.c */
 extern void roff_top(MONRACE_IDX r_idx);

diff --git a/src/monster-process.c b/src/monster-process.c
index 506892f..532088c 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -41,7 +41,7 @@ static bool get_enemy_dir(MONSTER_IDX m_idx, int *mm)
 {
        int i;
        POSITION x = 0, y = 0;
-       IDX t_idx;
+       MONSTER_IDX t_idx;
        int start;
        int plus = 1;
 
@@ -71,7 +71,7 @@ static bool get_enemy_dir(MONSTER_IDX m_idx, int *mm)
                /* Scan thru all monsters */
                for (i = start; ((i < start + m_max) && (i > start - m_max)); i+=plus)
                {
-                       IDX dummy = (i % m_max);
+                       MONSTER_IDX dummy = (i % m_max);
 
                        if (!dummy) continue;
 
@@ -203,7 +203,7 @@ static bool get_enemy_dir(MONSTER_IDX m_idx, int *mm)
  * @param who 打撃を行ったモンスターの参照ID
  * @return なし
  */
-void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, concptr note, IDX who)
+void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, concptr note, MONSTER_IDX who)
 {
        monster_type *m_ptr = &current_floor_ptr->m_list[m_idx];
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
@@ -3304,7 +3304,7 @@ void process_monster(MONSTER_IDX m_idx)
  */
 void process_monsters(void)
 {
-       IDX i;
+       MONSTER_IDX i;
        POSITION fx, fy;
 
        bool            test;

diff --git a/src/monster-status.c b/src/monster-status.c
index 4485b11..4f2e48f 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -830,7 +830,7 @@ bool process_the_world(int num, MONSTER_IDX who, bool vs_player)
 * @param s_idx 撃破されたモンスター種族の参照ID
 * @return なし
 */
-void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx)
+void monster_gain_exp(MONSTER_IDX m_idx, MONRACE_IDX s_idx)
 {
        monster_type *m_ptr;
        monster_race *r_ptr;

diff --git a/src/monster2.c b/src/monster2.c
index 0f272d4..7c5bf06 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -326,7 +326,7 @@ void delete_monster(POSITION y, POSITION x)
  * @param i2 配列移動先添字
  * @return なし
  */
-static void compact_monsters_aux(IDX i1, IDX i2)
+static void compact_monsters_aux(MONSTER_IDX i1, MONSTER_IDX i2)
 {
        POSITION y, x;
        int i;
@@ -2540,10 +2540,10 @@ static bool monster_hook_tanuki(MONRACE_IDX r_idx)
  * @param r_idx モンスター種族ID
  * @return モンスター種族の表層ID
  */
-static IDX initial_r_appearance(MONRACE_IDX r_idx)
+static MONRACE_IDX initial_r_appearance(MONRACE_IDX r_idx)
 {
        int attempts = 1000;
-       IDX ap_r_idx;
+       MONRACE_IDX ap_r_idx;
        DEPTH min = MIN(current_floor_ptr->base_level-5, 50);
 
        if (p_ptr->pseikaku == SEIKAKU_CHARGEMAN)