[Fix] #38997 spells2.c の整形漏れ修正 / Fixed reshaping spells2.c

diff --git a/src/mind.c b/src/mind.c
index 94116c0..da1e121 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -1589,7 +1589,7 @@ static bool cast_ninja_spell(player_type *caster_ptr, int spell)
        }
        case 5:
        {
-               if(!panic_hit()) return FALSE;
+               if(!hit_and_away(caster_ptr)) return FALSE;
                break;
        }
        case 6:

diff --git a/src/mutation.c b/src/mutation.c
index 7933437..1bb47e7 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -2271,7 +2271,7 @@ bool exe_mutation_power(player_type *creature_ptr, int power)
                        break;
 
                case MUT1_HIT_AND_AWAY:
-                       if(!hit_and_away()) return FALSE;
+                       if(!hit_and_away(creature_ptr)) return FALSE;
                        break;
 
                case MUT1_DAZZLE:

diff --git a/src/spells2.c b/src/spells2.c
index afcad05..10f8cf6 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -386,7 +386,7 @@ bool detect_monsters_normal(player_type *caster_ptr, POSITION range)
 
        POSITION y, x;
        bool flag = FALSE;
-       for (int i = 1; i < caster_ptr->current_floor_ptr->m_max; i++)
+       for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++)
        {
                monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i];
                monster_race *r_ptr = &r_info[m_ptr->r_idx];
@@ -432,7 +432,7 @@ bool detect_monsters_invis(player_type *caster_ptr, POSITION range)
 
        POSITION y, x;
        bool flag = FALSE;
-       for (int i = 1; i < caster_ptr->current_floor_ptr->m_max; i++)
+       for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++)
        {
                monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i];
                monster_race *r_ptr = &r_info[m_ptr->r_idx];
@@ -484,7 +484,7 @@ bool detect_monsters_evil(player_type *caster_ptr, POSITION range)
 
        POSITION y, x;
        bool flag = FALSE;
-       for (int i = 1; i < caster_ptr->current_floor_ptr->m_max; i++)
+       for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++)
        {
                monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i];
                monster_race *r_ptr = &r_info[m_ptr->r_idx];
@@ -540,7 +540,7 @@ bool detect_monsters_nonliving(player_type *caster_ptr, POSITION range)
 
        POSITION y, x;
        bool flag = FALSE;
-       for (int i = 1; i < caster_ptr->current_floor_ptr->m_max; i++)
+       for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++)
        {
                monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i];
                if (!monster_is_valid(m_ptr)) continue;