[Refactor] #37353 cave 配列を grid_array に改名。 / Rename cave array to grid_array().

[hengbandforosx/hengbandosx.git] / src / mane.c

diff --git a/src/mane.c b/src/mane.c
index 86ad761..2059a7e 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -14,6 +14,7 @@
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "cmd-spell.h"
+#include "player-status.h"
 
 static int damage;
 
@@ -284,7 +285,7 @@ static bool use_mane(int spell)
                MONSTER_IDX m_idx;
 
                if (!target_set(TARGET_KILL)) return FALSE;
-               m_idx = cave[target_row][target_col].m_idx;
+               m_idx = grid_array[target_row][target_col].m_idx;
                if (!m_idx) break;
                if (!player_has_los_bold(target_row, target_col)) break;
                if (!projectable(p_ptr->y, p_ptr->x, target_row, target_col)) break;
@@ -662,7 +663,7 @@ static bool use_mane(int spell)
                teleport_player(plev * 5, 0L);
                break;
        case MS_WORLD:
-               world_player = TRUE;
+               p_ptr->timewalk = TRUE;
                if (damage == 1 || damage == 2)
                        msg_print(_("「『ザ・ワールド』！時は止まった！」", "You yell 'The World! Time has stopped!'"));
                else if (damage == 3 || damage == 6)
@@ -672,11 +673,9 @@ static bool use_mane(int spell)
                msg_print(NULL);
 
                /* Hack */
-               p_ptr->energy_need -= 1000 + (100 + randint1(200)+200)*TURNS_PER_TICK/10;
-
+               p_ptr->energy_need -= 1000 + (100 + randint1(200) + 200) * TURNS_PER_TICK / 10;
                p_ptr->redraw |= (PR_MAP);
                p_ptr->update |= (PU_MONSTERS);
-
                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
                handle_stuff();
@@ -690,10 +689,10 @@ static bool use_mane(int spell)
                GAME_TEXT m_name[MAX_NLEN];
 
                if (!target_set(TARGET_KILL)) return FALSE;
-               if (!cave[target_row][target_col].m_idx) break;
+               if (!grid_array[target_row][target_col].m_idx) break;
                if (!player_has_los_bold(target_row, target_col)) break;
                if (!projectable(p_ptr->y, p_ptr->x, target_row, target_col)) break;
-               m_ptr = &m_list[cave[target_row][target_col].m_idx];
+               m_ptr = &m_list[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)
@@ -715,7 +714,7 @@ static bool use_mane(int spell)
                }
                msg_format(_("%sを引き戻した。", "You command %s to return."), m_name);
 
-               teleport_monster_to(cave[target_row][target_col].m_idx, p_ptr->y, p_ptr->x, 100, TELEPORT_PASSIVE);
+               teleport_monster_to(grid_array[target_row][target_col].m_idx, p_ptr->y, p_ptr->x, 100, TELEPORT_PASSIVE);
                break;
        }
        case MS_TELE_AWAY:
@@ -723,31 +722,10 @@ static bool use_mane(int spell)
 
                (void)fire_beam(GF_AWAY_ALL, dir, plev);
                break;
-       case MS_TELE_LEVEL:
-       {
-               IDX target_m_idx;
-               monster_type *m_ptr;
-               monster_race *r_ptr;
-               GAME_TEXT m_name[MAX_NLEN];
-
-               if (!target_set(TARGET_KILL)) return FALSE;
-               target_m_idx = cave[target_row][target_col].m_idx;
-               if (!target_m_idx) break;
-               if (!player_has_los_bold(target_row, target_col)) break;
-               if (!projectable(p_ptr->y, p_ptr->x, target_row, target_col)) break;
-               m_ptr = &m_list[target_m_idx];
-               r_ptr = &r_info[m_ptr->r_idx];
-               monster_desc(m_name, m_ptr, 0);
-               msg_format(_("%^sの足を指さした。", "You gesture at %^s's feet."), m_name);
 
-               if ((r_ptr->flagsr & (RFR_EFF_RES_NEXU_MASK | RFR_RES_TELE)) ||
-                       (r_ptr->flags1 & RF1_QUESTOR) || (r_ptr->level + randint1(50) > plev + randint1(60)))
-               {
-                       msg_print(_("しかし効果がなかった！", "%^s is unaffected!"));
-               }
-               else teleport_level(target_m_idx);
+       case MS_TELE_LEVEL:
+               return teleport_level_other(p_ptr);
                break;
-       }
 
        case MS_PSY_SPEAR:
                if (!get_aim_dir(&dir)) return FALSE;
@@ -957,13 +935,7 @@ bool do_cmd_mane(bool baigaesi)
        monster_power   spell;
        bool            cast;
 
-
-       /* not if confused */
-       if (p_ptr->confused)
-       {
-               msg_print(_("混乱していて集中できない！", "You are too confused!"));
-               return TRUE;
-       }
+       if (cmd_limit_confused(p_ptr)) return FALSE;
 
        if (!p_ptr->mane_num)
        {
@@ -1026,7 +998,7 @@ bool do_cmd_mane(bool baigaesi)
                p_ptr->mane_dam[j] = p_ptr->mane_dam[j+1];
        }
 
-       p_ptr->energy_use = 100;
+       take_turn(p_ptr, 100);;
 
        p_ptr->redraw |= (PR_IMITATION);
        p_ptr->window |= (PW_PLAYER);