#37287 #37353 (2.2.0.89) EGO_IDX, ACTIVATE_IDX型を定義し、型の置換を継続中。 / Define EGO_IDX, ACTIV...

[hengband/hengband.git] / src / mutation.c

diff --git a/src/mutation.c b/src/mutation.c
index c41367e..54694ea 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -2010,7 +2010,7 @@ void do_cmd_knowledge_mutations(void)
  * @param x ビット数を調べたい変数
  * @return ビット数
  */
-int count_bits(u32b x)
+int count_bits(BIT_FLAGS x)
 {
        int n = 0;
 
@@ -2073,7 +2073,7 @@ int calc_mutant_regenerate_mod(void)
  * @brief 突然変異レイシャル上で口を使うよりを行った際に歌や呪術を停止する /
  * @return なし
  */
-void mutation_stop_mouth()
+static void mutation_stop_mouth(void)
 {
        if (music_singing_any()) stop_singing();
        if (hex_spelling_any()) stop_hex_spell_all();
@@ -2149,8 +2149,8 @@ bool mutation_power_aux(u32b power)
 
                                /* Only works on adjacent monsters */
                                if (!get_rep_dir2(&dir)) return FALSE;
-                               y = py + ddy[dir];
-                               x = px + ddx[dir];
+                               y = p_ptr->y + ddy[dir];
+                               x = p_ptr->x + ddx[dir];
                                c_ptr = &cave[y][x];
 
                                mutation_stop_mouth();
@@ -2210,8 +2210,8 @@ bool mutation_power_aux(u32b power)
                                feature_type *f_ptr, *mimic_f_ptr;
 
                                if (!get_rep_dir2(&dir)) return FALSE;
-                               y = py + ddy[dir];
-                               x = px + ddx[dir];
+                               y = p_ptr->y + ddy[dir];
+                               x = p_ptr->x + ddx[dir];
                                c_ptr = &cave[y][x];
                                f_ptr = &f_info[c_ptr->feat];
                                mimic_f_ptr = &f_info[get_feat_mimic(c_ptr)];
@@ -2326,7 +2326,7 @@ bool mutation_power_aux(u32b power)
                                int i;
                                for (i = 0; i < 8; i++)
                                {
-                                       summon_specific(-1, py, px, lvl, SUMMON_MOLD, PM_FORCE_PET);
+                                       summon_specific(-1, p_ptr->y, p_ptr->x, lvl, SUMMON_MOLD, PM_FORCE_PET);
                                }
                        }
                        break;
@@ -2334,7 +2334,7 @@ bool mutation_power_aux(u32b power)
                case MUT1_RESIST:
                        {
                                int num = lvl / 10;
-                               int dur = randint1(20) + 20;
+                               TIME_EFFECT dur = randint1(20) + 20;
 
                                if (randint0(5) < num)
                                {
@@ -2365,7 +2365,7 @@ bool mutation_power_aux(u32b power)
                        break;
 
                case MUT1_EARTHQUAKE:
-                       (void)earthquake(py, px, 10);
+                       (void)earthquake(p_ptr->y, p_ptr->x, 10);
                        break;
 
                case MUT1_EAT_MAGIC:
@@ -2394,8 +2394,8 @@ bool mutation_power_aux(u32b power)
                                int x, y;
 
                                if (!get_rep_dir2(&dir)) return FALSE;
-                               y = py + ddy[dir];
-                               x = px + ddx[dir];
+                               y = p_ptr->y + ddy[dir];
+                               x = p_ptr->x + ddx[dir];
                                if (cave[y][x].m_idx)
                                {
                                        py_attack(y, x, 0);
@@ -2435,8 +2435,8 @@ bool mutation_power_aux(u32b power)
                                monster_race *r_ptr;
 
                                if (!get_rep_dir2(&dir)) return FALSE;
-                               y = py + ddy[dir];
-                               x = px + ddx[dir];
+                               y = p_ptr->y + ddy[dir];
+                               x = p_ptr->x + ddx[dir];
                                c_ptr = &cave[y][x];
 
                                if (!c_ptr->m_idx)
@@ -2484,8 +2484,8 @@ bool mutation_power_aux(u32b power)
                                cave_type *c_ptr;
 
                                if (!get_rep_dir2(&dir)) return FALSE;
-                               y = py + ddy[dir];
-                               x = px + ddx[dir];
+                               y = p_ptr->y + ddy[dir];
+                               x = p_ptr->x + ddx[dir];
                                c_ptr = &cave[y][x];
 
                                if (!c_ptr->m_idx)
@@ -2505,7 +2505,7 @@ bool mutation_power_aux(u32b power)
                        break;
 
                default:
-                       energy_use = 0;
+                       p_ptr->energy_use = 0;
                        msg_format(_("能力 %s は実装されていません。", "Power %s not implemented. Oops."), power);
        }