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

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

diff --git a/src/spells2.c b/src/spells2.c
index 904d201..c2ff0ca 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -25,8 +25,8 @@
  */
 static bool detect_feat_flag(POSITION range, int flag, bool known)
 {
-       int       x, y;
-       bool      detect = FALSE;
+       int x, y;
+       bool detect = FALSE;
        cave_type *c_ptr;
 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
@@ -74,8 +74,6 @@ static bool detect_feat_flag(POSITION range, int flag, bool known)
                        }
                }
        }
-
-       /* Result */
        return detect;
 }
 
@@ -99,8 +97,6 @@ bool detect_traps(POSITION range, bool known)
        {
                msg_print(_("トラップの存在を感じとった！", "You sense the presence of traps!"));
        }
-
-       /* Result */
        return detect;
 }
 
@@ -121,8 +117,6 @@ bool detect_doors(POSITION range)
        {
                msg_print(_("ドアの存在を感じとった！", "You sense the presence of doors!"));
        }
-
-       /* Result */
        return detect;
 }
 
@@ -143,8 +137,6 @@ bool detect_stairs(POSITION range)
        {
                msg_print(_("階段の存在を感じとった！", "You sense the presence of stairs!"));
        }
-
-       /* Result */
        return detect;
 }
 
@@ -165,8 +157,6 @@ bool detect_treasure(POSITION range)
        {
                msg_print(_("埋蔵された財宝の存在を感じとった！", "You sense the presence of buried treasure!"));
        }
-
-       /* Result */
        return detect;
 }
 
@@ -205,13 +195,8 @@ bool detect_objects_gold(POSITION range)
                /* Detect "gold" objects */
                if (o_ptr->tval == TV_GOLD)
                {
-                       /* Hack -- memorize it */
                        o_ptr->marked |= OM_FOUND;
-
-                       /* Redraw */
                        lite_spot(y, x);
-
-                       /* Detect */
                        detect = TRUE;
                }
        }
@@ -228,8 +213,6 @@ bool detect_objects_gold(POSITION range)
        {
                detect = TRUE;
        }
-
-       /* Result */
        return (detect);
 }
 
@@ -268,13 +251,8 @@ bool detect_objects_normal(POSITION range)
                /* Detect "real" objects */
                if (o_ptr->tval != TV_GOLD)
                {
-                       /* Hack -- memorize it */
                        o_ptr->marked |= OM_FOUND;
-
-                       /* Redraw */
                        lite_spot(y, x);
-
-                       /* Detect */
                        detect = TRUE;
                }
        }
@@ -291,8 +269,6 @@ bool detect_objects_normal(POSITION range)
        {
                detect = TRUE;
        }
-
-       /* Result */
        return (detect);
 }
 
@@ -366,11 +342,7 @@ bool detect_objects_magic(POSITION range)
                {
                        /* Memorize the item */
                        o_ptr->marked |= OM_FOUND;
-
-                       /* Redraw */
                        lite_spot(y, x);
-
-                       /* Detect */
                        detect = TRUE;
                }
        }
@@ -426,8 +398,6 @@ bool detect_monsters_normal(POSITION range)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -440,8 +410,6 @@ bool detect_monsters_normal(POSITION range)
                /* Describe result */
                msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -491,8 +459,6 @@ bool detect_monsters_invis(POSITION range)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -505,8 +471,6 @@ bool detect_monsters_invis(POSITION range)
                /* Describe result */
                msg_print(_("透明な生物の存在を感じとった！", "You sense the presence of invisible creatures!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -561,8 +525,6 @@ bool detect_monsters_evil(POSITION range)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -573,8 +535,6 @@ bool detect_monsters_evil(POSITION range)
                /* Describe result */
                msg_print(_("邪悪なる生物の存在を感じとった！", "You sense the presence of evil creatures!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -623,8 +583,6 @@ bool detect_monsters_nonliving(POSITION range)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -635,8 +593,6 @@ bool detect_monsters_nonliving(POSITION range)
                /* Describe result */
                msg_print(_("自然でないモンスターの存在を感じた！", "You sense the presence of unnatural beings!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -685,8 +641,6 @@ bool detect_monsters_mind(POSITION range)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -697,8 +651,6 @@ bool detect_monsters_mind(POSITION range)
                /* Describe result */
                msg_print(_("殺気を感じとった！", "You sense the presence of someone's mind!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -749,8 +701,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -763,8 +713,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
                /* Describe result */
                msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -821,8 +769,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -844,8 +790,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
                msg_format(_("%sの存在を感じとった！", "You sense the presence of %s!"), desc_monsters);
                msg_print(NULL);
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -871,8 +815,6 @@ bool detect_all(POSITION range)
        if (detect_objects_normal(range)) detect = TRUE;
        if (detect_monsters_invis(range)) detect = TRUE;
        if (detect_monsters_normal(range)) detect = TRUE;
-
-       /* Result */
        return (detect);
 }
 
@@ -933,8 +875,6 @@ bool project_hack(EFFECT_ID typ, HIT_POINT dam)
                /* Jump directly to the target monster */
                if (project(0, 0, y, x, dam, typ, flg, -1)) obvious = TRUE;
        }
-
-       /* Result */
        return (obvious);
 }
 
@@ -1467,8 +1407,6 @@ bool probing(void)
                chg_virtue(V_KNOWLEDGE, 1);
                msg_print(_("これで全部です。", "That's all."));
        }
-
-       /* Result */
        return (probe);
 }
 
@@ -2462,7 +2400,6 @@ static void cave_temp_room_unlite(void)
                                /* Forget the grid */
                                if (!view_torch_grids) c_ptr->info &= ~(CAVE_MARK);
 
-                               /* Notice */
                                note_spot(y, x);
                        }
 
@@ -5082,7 +5019,7 @@ bool_hack vampirism(void)
        }
 
        /* Only works on adjacent monsters */
-       if (!get_rep_dir2(&dir)) return FALSE;
+       if (!get_direction(&dir, FALSE, FALSE)) return FALSE;
        y = p_ptr->y + ddy[dir];
        x = p_ptr->x + ddx[dir];
        c_ptr = &cave[y][x];
@@ -5125,7 +5062,7 @@ bool panic_hit(void)
        DIRECTION dir;
        POSITION x, y;
 
-       if (!get_rep_dir2(&dir)) return FALSE;
+       if (!get_direction(&dir, FALSE, FALSE)) return FALSE;
        y = p_ptr->y + ddy[dir];
        x = p_ptr->x + ddx[dir];
        if (cave[y][x].m_idx)
@@ -5168,7 +5105,6 @@ bool psychometry(void)
        bool okay = FALSE;
 
        item_tester_no_ryoute = TRUE;
-       /* Get an item */
        q = _("どのアイテムを調べますか？", "Meditate on which item? ");
        s = _("調べるアイテムがありません。", "You have nothing appropriate.");