[Refactor] #37353 tsuri_dir を fishing_dir に改名して player_type 構造体に移動。

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

diff --git a/src/spells2.c b/src/spells2.c
index cd4dde9..ca0d1e0 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;
@@ -69,13 +69,10 @@ static bool detect_feat_flag(POSITION range, int flag, bool known)
                                /* Redraw */
                                lite_spot(y, x);
 
-                               /* Obvious */
                                detect = TRUE;
                        }
                }
        }
-
-       /* Result */
        return detect;
 }
 
@@ -99,8 +96,6 @@ bool detect_traps(POSITION range, bool known)
        {
                msg_print(_("トラップの存在を感じとった！", "You sense the presence of traps!"));
        }
-
-       /* Result */
        return detect;
 }
 
@@ -121,8 +116,6 @@ bool detect_doors(POSITION range)
        {
                msg_print(_("ドアの存在を感じとった！", "You sense the presence of doors!"));
        }
-
-       /* Result */
        return detect;
 }
 
@@ -143,8 +136,6 @@ bool detect_stairs(POSITION range)
        {
                msg_print(_("階段の存在を感じとった！", "You sense the presence of stairs!"));
        }
-
-       /* Result */
        return detect;
 }
 
@@ -165,8 +156,6 @@ bool detect_treasure(POSITION range)
        {
                msg_print(_("埋蔵された財宝の存在を感じとった！", "You sense the presence of buried treasure!"));
        }
-
-       /* Result */
        return detect;
 }
 
@@ -205,13 +194,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 +212,6 @@ bool detect_objects_gold(POSITION range)
        {
                detect = TRUE;
        }
-
-       /* Result */
        return (detect);
 }
 
@@ -268,13 +250,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 +268,6 @@ bool detect_objects_normal(POSITION range)
        {
                detect = TRUE;
        }
-
-       /* Result */
        return (detect);
 }
 
@@ -366,11 +341,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 +397,6 @@ bool detect_monsters_normal(POSITION range)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -440,8 +409,6 @@ bool detect_monsters_normal(POSITION range)
                /* Describe result */
                msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -480,7 +447,6 @@ bool detect_monsters_invis(POSITION range)
                        /* Update monster recall window */
                        if (p_ptr->monster_race_idx == m_ptr->r_idx)
                        {
-                               /* Window stuff */
                                p_ptr->window |= (PW_MONSTER);
                        }
 
@@ -492,8 +458,6 @@ bool detect_monsters_invis(POSITION range)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -506,8 +470,6 @@ bool detect_monsters_invis(POSITION range)
                /* Describe result */
                msg_print(_("透明な生物の存在を感じとった！", "You sense the presence of invisible creatures!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -550,7 +512,6 @@ bool detect_monsters_evil(POSITION range)
                                /* Update monster recall window */
                                if (p_ptr->monster_race_idx == m_ptr->r_idx)
                                {
-                                       /* Window stuff */
                                        p_ptr->window |= (PW_MONSTER);
                                }
                        }
@@ -563,8 +524,6 @@ bool detect_monsters_evil(POSITION range)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -575,8 +534,6 @@ bool detect_monsters_evil(POSITION range)
                /* Describe result */
                msg_print(_("邪悪なる生物の存在を感じとった！", "You sense the presence of evil creatures!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -614,7 +571,6 @@ bool detect_monsters_nonliving(POSITION range)
                        /* Update monster recall window */
                        if (p_ptr->monster_race_idx == m_ptr->r_idx)
                        {
-                               /* Window stuff */
                                p_ptr->window |= (PW_MONSTER);
                        }
 
@@ -626,8 +582,6 @@ bool detect_monsters_nonliving(POSITION range)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -638,8 +592,6 @@ bool detect_monsters_nonliving(POSITION range)
                /* Describe result */
                msg_print(_("自然でないモンスターの存在を感じた！", "You sense the presence of unnatural beings!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -677,7 +629,6 @@ bool detect_monsters_mind(POSITION range)
                        /* Update monster recall window */
                        if (p_ptr->monster_race_idx == m_ptr->r_idx)
                        {
-                               /* Window stuff */
                                p_ptr->window |= (PW_MONSTER);
                        }
 
@@ -689,8 +640,6 @@ bool detect_monsters_mind(POSITION range)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -701,8 +650,6 @@ bool detect_monsters_mind(POSITION range)
                /* Describe result */
                msg_print(_("殺気を感じとった！", "You sense the presence of someone's mind!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -742,7 +689,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
                        /* Update monster recall window */
                        if (p_ptr->monster_race_idx == m_ptr->r_idx)
                        {
-                               /* Window stuff */
                                p_ptr->window |= (PW_MONSTER);
                        }
 
@@ -754,8 +700,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -768,8 +712,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
                /* Describe result */
                msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!"));
        }
-
-       /* Result */
        return (flag);
 }
 
@@ -814,7 +756,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
                                /* Update monster recall window */
                                if (p_ptr->monster_race_idx == m_ptr->r_idx)
                                {
-                                       /* Window stuff */
                                        p_ptr->window |= (PW_MONSTER);
                                }
                        }
@@ -827,8 +768,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
 
                        /* Update the monster */
                        update_mon(i, FALSE);
-
-                       /* Detect */
                        flag = TRUE;
                }
        }
@@ -850,8 +789,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);
 }
 
@@ -877,8 +814,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);
 }
 
@@ -939,8 +874,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);
 }
 
@@ -1137,7 +1070,7 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
        else if (player_cast && (r_ptr->level > randint0(power))) resist = TRUE;
        else if (player_cast && (m_ptr->mflag2 & MFLAG2_NOGENO)) resist = TRUE;
 
-       /* Delete the monster */
+
        else
        {
                if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
@@ -1182,7 +1115,6 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
 
        if (player_cast)
        {
-               /* Take damage */
                take_hit(DAMAGE_GENO, randint1(dam_side), format(_("%^sの呪文を唱えた疲労", "the strain of casting %^s"), spell_name), -1);
        }
 
@@ -1191,14 +1123,10 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
 
        /* Redraw */
        p_ptr->redraw |= (PR_HP);
-
-       /* Window stuff */
        p_ptr->window |= (PW_PLAYER);
 
        /* Handle */
        handle_stuff();
-
-       /* Fresh */
        Term_fresh();
 
        /* Delay */
@@ -1474,8 +1402,6 @@ bool probing(void)
                chg_virtue(V_KNOWLEDGE, 1);
                msg_print(_("これで全部です。", "That's all."));
        }
-
-       /* Result */
        return (probe);
 }
 
@@ -1745,13 +1671,11 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
                /* Mega-Hack -- Forget the view and lite */
                p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
 
-               /* Update stuff */
                p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS);
 
                /* Redraw map */
                p_ptr->redraw |= (PR_MAP);
 
-               /* Window stuff */
                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
                if (p_ptr->special_defense & NINJA_S_STEALTH)
@@ -2086,7 +2010,7 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
                                                        }
                                                }
 
-                                               /* Delete the monster */
+
                                                delete_monster(yy, xx);
 
                                                /* No longer safe */
@@ -2228,7 +2152,6 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
        /* Mega-Hack -- Forget the view and lite */
        p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
 
-       /* Update stuff */
        p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS);
 
        /* Update the health bar */
@@ -2237,7 +2160,6 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
        /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
 
-       /* Window stuff */
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
        if (p_ptr->special_defense & NINJA_S_STEALTH)
@@ -2473,7 +2395,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);
                        }
 
@@ -3469,7 +3390,6 @@ bool wall_stone(void)
 
        bool dummy = (project(0, 1, p_ptr->y, p_ptr->x, 0, GF_STONE_WALL, flg, -1));
 
-       /* Update stuff */
        p_ptr->update |= (PU_FLOW);
 
        /* Redraw map */
@@ -5094,7 +5014,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];
@@ -5137,7 +5057,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)
@@ -5180,7 +5100,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.");
 
@@ -5240,7 +5159,6 @@ bool psychometry(void)
        /* Combine / Reorder the pack (later) */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
        /* Valid "tval" codes */