[Refactor] #define ALLOW_EASY_DISARM による分岐処理削除 / Delete #define branch by ALLOW_EASY_...

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

diff --git a/src/spells1.c b/src/spells1.c
index be4b48c..e1276c9 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -904,7 +904,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                                c_ptr->mimic = old_mimic;
 
-                               /* Notice */
                                note_spot(y, x);
 
                                /* Redraw */
@@ -996,7 +995,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        c_ptr->info |= CAVE_OBJECT;
                        c_ptr->mimic = feat_glyph;
 
-                       /* Notice */
                        note_spot(y, x);
 
                        /* Redraw */
@@ -1075,7 +1073,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        {
                                c_ptr->info |= (CAVE_GLOW);
 
-                               /* Notice */
                                note_spot(y, x);
 
                                /* Redraw */
@@ -1139,7 +1136,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                        /* Forget */
                                        c_ptr->info &= ~(CAVE_MARK);
 
-                                       /* Notice */
                                        note_spot(y, x);
                                }
 
@@ -1148,7 +1144,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                                update_local_illumination(y, x);
 
-                               /* Notice */
                                if (player_can_see_bold(y, x)) obvious = TRUE;
 
                                /* Mega-Hack -- Update the monster in the affected grid */
@@ -1483,7 +1478,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                                /* Identify */
                                                object_known(o_ptr);
 
-                                               /* Notice */
                                                if (known && (o_ptr->marked & OM_FOUND))
                                                {
                                                        msg_print(_("カチッと音がした！", "Click!"));
@@ -1747,7 +1741,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        /* Get the monster possessive ("his"/"her"/"its") */
        monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 
-       if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(1, 1);
+       if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(TRUE, TRUE);
 
        /* Analyze the damage type */
        switch (typ)
@@ -5217,7 +5211,7 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
 
                project(0, 0, t_y, t_x, dam, typ, (PROJECT_STOP|PROJECT_KILL|PROJECT_REFLECTABLE), monspell);
 
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
                return TRUE;
        }
 
@@ -6233,8 +6227,7 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
        }
 
 
-       /* Disturb */
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
 
 
        if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && who && (who != p_ptr->riding))