[Refactor] #38997 use_mane() に player_type * 引数を追加． / Add player_type * argument...

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index c2d2a06..7ad6506 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -291,7 +291,7 @@ static bool use_mane(player_type *caster_ptr, int spell)
                MONSTER_IDX m_idx;
 
                if (!target_set(TARGET_KILL)) return FALSE;
-               m_idx = p_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx;
+               m_idx = caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx;
                if (!m_idx) break;
                if (!player_has_los_bold(target_row, target_col)) break;
                if (!projectable(caster_ptr->y, caster_ptr->x, target_row, target_col)) break;
@@ -680,10 +680,10 @@ static bool use_mane(player_type *caster_ptr, int spell)
                GAME_TEXT m_name[MAX_NLEN];
 
                if (!target_set(TARGET_KILL)) return FALSE;
-               if (!p_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx) break;
+               if (!caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx) break;
                if (!player_has_los_bold(target_row, target_col)) break;
                if (!projectable(caster_ptr->y, caster_ptr->x, target_row, target_col)) break;
-               m_ptr = &p_ptr->current_floor_ptr->m_list[p_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx];
+               m_ptr = &caster_ptr->current_floor_ptr->m_list[caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx];
                r_ptr = &r_info[m_ptr->r_idx];
                monster_desc(m_name, m_ptr, 0);
                if (r_ptr->flagsr & RFR_RES_TELE)
@@ -705,7 +705,7 @@ static bool use_mane(player_type *caster_ptr, int spell)
                }
                msg_format(_("%sを引き戻した。", "You command %s to return."), m_name);
 
-               teleport_monster_to(p_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx, caster_ptr->y, caster_ptr->x, 100, TELEPORT_PASSIVE);
+               teleport_monster_to(caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx, caster_ptr->y, caster_ptr->x, 100, TELEPORT_PASSIVE);
                break;
        }
        case MS_TELE_AWAY:
@@ -756,7 +756,7 @@ static bool use_mane(player_type *caster_ptr, int spell)
        case MS_S_CYBER:
        {
                int k;
-               int max_cyber = (p_ptr->current_floor_ptr->dun_level / 50) + randint1(3);
+               int max_cyber = (caster_ptr->current_floor_ptr->dun_level / 50) + randint1(3);
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("サイバーデーモンを召喚した！", "You summon Cyberdemons!"));
                if (max_cyber > 4) max_cyber = 4;