[Refactor] #37353 TRAP_* 定義を trap.h へ移動、関連要素も整理。 / Move TRAP_* definition to trap...

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

diff --git a/src/mind.c b/src/mind.c
index 4c19ce3..9563ffa 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -14,9 +14,9 @@
  * 特殊技能を揃えて実装している。
  */
 
-
-
 #include "angband.h"
+#include "melee.h"
+#include "projection.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =
@@ -289,7 +289,7 @@ mind_power const mind_powers[5] =
 };
 
 /*! 特殊能力の解説文字列 */
-static cptr const mind_tips[5][MAX_MIND_POWERS] =
+static concptr const mind_tips[5][MAX_MIND_POWERS] =
 {
 #ifdef JP
 {
@@ -537,13 +537,13 @@ static cptr const mind_tips[5][MAX_MIND_POWERS] =
 void mindcraft_info(char *p, int use_mind, int power)
 {
 #ifdef JP
-       cptr s_dam = "損傷:";
-       cptr s_dur = "期間:";
-       cptr s_range = "範囲:";
+       concptr s_dam = "損傷:";
+       concptr s_dur = "期間:";
+       concptr s_range = "範囲:";
 #else
-       cptr s_dam = "dam ";
-       cptr s_dur = "dur ";
-       cptr s_range = "range ";
+       concptr s_dam = "dam ";
+       concptr s_dur = "dur ";
+       concptr s_range = "range ";
 #endif
        PLAYER_LEVEL plev = p_ptr->lev;
 
@@ -688,7 +688,7 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
        char            choice;
        char            out_val[160];
        char            comment[80];
-       cptr            p;
+       concptr            p;
        COMMAND_CODE code;
        mind_type       spell;
        const mind_power      *mind_ptr;
@@ -843,8 +843,6 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
 
                                /* Show list */
                                redraw = TRUE;
-
-                               /* Save the screen */
                                if (!only_browse && !use_menu) screen_save();
 
                                /* Display a list of spells */
@@ -950,8 +948,6 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
                        {
                                /* Hide list */
                                redraw = FALSE;
-
-                               /* Restore the screen */
                                screen_load();
                        }
 
@@ -996,14 +992,10 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
                /* Stop the loop */
                flag = TRUE;
        }
-
-       /* Restore the screen */
        if (redraw && !only_browse) screen_load();
 
-       /* Show choices */
        p_ptr->window |= (PW_SPELL);
-
-       window_stuff();
+       handle_stuff();
 
        /* Abort if needed */
        if (!flag) return (FALSE);
@@ -1182,8 +1174,6 @@ static bool cast_mindcrafter_spell(int spell)
                p_ptr->energy_need -= 1000 + (100 + p_ptr->csp - 50)*TURNS_PER_TICK/10;
 
                p_ptr->redraw |= (PR_MAP);
-
-               /* Update monsters */
                p_ptr->update |= (PU_MONSTERS);
 
                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
@@ -1274,7 +1264,7 @@ static bool cast_force_spell(int spell)
                bool success = FALSE;
 
                for (i = 0; i < 1 + boost/100; i++)
-                       if (summon_specific(-1, p_ptr->y, p_ptr->x, plev, SUMMON_PHANTOM, PM_FORCE_PET))
+                       if (summon_specific(-1, p_ptr->y, p_ptr->x, plev, SUMMON_PHANTOM, PM_FORCE_PET, '\0'))
                                success = TRUE;
                if (success)
                {
@@ -1452,7 +1442,7 @@ static bool cast_mirror_spell(int spell)
 
                /* mirror of recall */
        case 17:
-               return word_of_recall();
+               return recall_player(p_ptr, randint0(21) + 15);
                /* multi-shadow */
        case 18:
                set_multishadow(6 + randint1(6), FALSE);
@@ -1656,7 +1646,7 @@ static bool cast_ninja_spell(int spell)
        {
                monster_type *m_ptr;
                MONSTER_IDX m_idx;
-               char m_name[80];
+               GAME_TEXT m_name[MAX_NLEN];
                int i;
                int path_n;
                u16b path_g[512];
@@ -1700,13 +1690,8 @@ static bool cast_ninja_spell(int spell)
                /* Wake the monster up */
                (void)set_monster_csleep(m_idx, 0);
 
-               /* Update the monster (new location) */
                update_monster(m_idx, TRUE);
-
-               /* Redraw the old grid */
                lite_spot(target_row, target_col);
-
-               /* Redraw the new grid */
                lite_spot(ty, tx);
 
                if (r_info[m_ptr->r_idx].flags7 & (RF7_LITE_MASK | RF7_DARK_MASK))
@@ -1797,7 +1782,7 @@ void do_cmd_mind(void)
        mind_type       spell;
        bool            cast;
        int             use_mind, mana_cost;
-       cptr            p;
+       concptr            p;
        bool            on_mirror = FALSE;
 
        /* not if confused */