[Refactor] #37353 コメント整理。 / Refactor comments.

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

diff --git a/src/spells2.c b/src/spells2.c
index 139786f..effed82 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -15,6 +15,7 @@
 #include "grid.h"
 #include "trap.h"
 #include "monsterrace-hook.h"
+#include "melee.h"
 
 
 /*!
@@ -353,12 +354,10 @@ bool detect_monsters_normal(POSITION range)
 {
        MONSTER_IDX i;
        POSITION y, x;
-
        bool flag = FALSE;
 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
 
-       /* Scan monsters */
        for (i = 1; i < m_max; i++)
        {
                monster_type *m_ptr = &m_list[i];
@@ -379,7 +378,6 @@ bool detect_monsters_normal(POSITION range)
                        /* Repair visibility later */
                        repair_monsters = TRUE;
 
-                       /* Hack -- Detect monster */
                        m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
                        update_monster(i, FALSE);
                        flag = TRUE;
@@ -389,7 +387,6 @@ bool detect_monsters_normal(POSITION range)
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 3) flag = FALSE;
        if (flag)
        {
-               /* Describe result */
                msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!"));
        }
        return (flag);
@@ -409,7 +406,6 @@ bool detect_monsters_invis(POSITION range)
 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
 
-       /* Scan monsters */
        for (i = 1; i < m_max; i++)
        {
                monster_type *m_ptr = &m_list[i];
@@ -436,7 +432,6 @@ bool detect_monsters_invis(POSITION range)
                        /* Repair visibility later */
                        repair_monsters = TRUE;
 
-                       /* Hack -- Detect monster */
                        m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
                        update_monster(i, FALSE);
                        flag = TRUE;
@@ -446,7 +441,6 @@ bool detect_monsters_invis(POSITION range)
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 3) flag = FALSE;
        if (flag)
        {
-               /* Describe result */
                msg_print(_("透明な生物の存在を感じとった！", "You sense the presence of invisible creatures!"));
        }
        return (flag);
@@ -465,7 +459,6 @@ bool detect_monsters_evil(POSITION range)
 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
 
-       /* Scan monsters */
        for (i = 1; i < m_max; i++)
        {
                monster_type *m_ptr = &m_list[i];
@@ -498,7 +491,6 @@ bool detect_monsters_evil(POSITION range)
                        /* Repair visibility later */
                        repair_monsters = TRUE;
 
-                       /* Hack -- Detect monster */
                        m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
                        update_monster(i, FALSE);
                        flag = TRUE;
@@ -506,7 +498,6 @@ bool detect_monsters_evil(POSITION range)
        }
        if (flag)
        {
-               /* Describe result */
                msg_print(_("邪悪なる生物の存在を感じとった！", "You sense the presence of evil creatures!"));
        }
        return (flag);
@@ -525,11 +516,9 @@ bool detect_monsters_nonliving(POSITION range)
 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
 
-       /* Scan monsters */
        for (i = 1; i < m_max; i++)
        {
                monster_type *m_ptr = &m_list[i];
-               monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
                /* Skip dead monsters */
                if (!m_ptr->r_idx) continue;
@@ -552,7 +541,6 @@ bool detect_monsters_nonliving(POSITION range)
                        /* Repair visibility later */
                        repair_monsters = TRUE;
 
-                       /* Hack -- Detect monster */
                        m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
                        update_monster(i, FALSE);
                        flag = TRUE;
@@ -560,7 +548,6 @@ bool detect_monsters_nonliving(POSITION range)
        }
        if (flag)
        {
-               /* Describe result */
                msg_print(_("自然でないモンスターの存在を感じた！", "You sense the presence of unnatural beings!"));
        }
        return (flag);
@@ -579,7 +566,6 @@ bool detect_monsters_mind(POSITION range)
 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
 
-       /* Scan monsters */
        for (i = 1; i < m_max; i++)
        {
                monster_type *m_ptr = &m_list[i];
@@ -606,7 +592,6 @@ bool detect_monsters_mind(POSITION range)
                        /* Repair visibility later */
                        repair_monsters = TRUE;
 
-                       /* Hack -- Detect monster */
                        m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
                        update_monster(i, FALSE);
                        flag = TRUE;
@@ -614,7 +599,6 @@ bool detect_monsters_mind(POSITION range)
        }
        if (flag)
        {
-               /* Describe result */
                msg_print(_("殺気を感じとった！", "You sense the presence of someone's mind!"));
        }
        return (flag);
@@ -635,7 +619,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
 
-       /* Scan monsters */
        for (i = 1; i < m_max; i++)
        {
                monster_type *m_ptr = &m_list[i];
@@ -662,7 +645,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
                        /* Repair visibility later */
                        repair_monsters = TRUE;
 
-                       /* Hack -- Detect monster */
                        m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
                        update_monster(i, FALSE);
                        flag = TRUE;
@@ -672,7 +654,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 3) flag = FALSE;
        if (flag)
        {
-               /* Describe result */
                msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!"));
        }
        return (flag);
@@ -693,7 +674,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
 
-       /* Scan monsters */
        for (i = 1; i < m_max; i++)
        {
                monster_type *m_ptr = &m_list[i];
@@ -726,7 +706,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
                        /* Repair visibility later */
                        repair_monsters = TRUE;
 
-                       /* Hack -- Detect monster */
                        m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
                        update_monster(i, FALSE);
                        flag = TRUE;
@@ -744,7 +723,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
                                break;
                }
 
-               /* Describe result */
                msg_format(_("%sの存在を感じとった！", "You sense the presence of %s!"), desc_monsters);
                msg_print(NULL);
        }
@@ -1082,7 +1060,6 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
        p_ptr->redraw |= (PR_HP);
        p_ptr->window |= (PW_PLAYER);
 
-       /* Handle */
        handle_stuff();
        Term_fresh();
 
@@ -1233,7 +1210,7 @@ bool mass_genocide_undead(int power, bool player_cast)
 bool probing(void)
 {
        int i;
-       SPEED speed;
+       int speed; /* TODO */
        bool_hack cu, cv;
        bool probe = FALSE;
        char buf[256];
@@ -1317,8 +1294,9 @@ bool probing(void)
 
                        /* HACK : Add the line to message buffer */
                        message_add(buf);
+
                        p_ptr->window |= (PW_MESSAGE);
-                       window_stuff();
+                       handle_stuff();
 
                        if (m_ptr->ml) move_cursor_relative(m_ptr->fy, m_ptr->fx);
                        inkey();
@@ -2247,11 +2225,7 @@ static void cave_temp_room_lite(void)
                                if (m_ptr->ml)
                                {
                                        char m_name[80];
-
-                                       /* Acquire the monster name */
                                        monster_desc(m_name, m_ptr, 0);
-
-                                       /* Dump a message */
                                        msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
                                }
                        }
@@ -4803,7 +4777,7 @@ bool_hack life_stream(bool_hack message, bool_hack virtue)
        (void)set_cut(0);
        (void)restore_all_status();
        (void)set_shero(0, TRUE);
-       update_stuff();
+       handle_stuff();
        hp_player(5000);
 
        return TRUE;