[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 8d917e6..e1276c9 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -248,7 +248,6 @@ static byte spell_color(int type)
                /* Lookup the default colors for this type */
                cptr s = quark_str(gf_color[type]);
 
-               /* Oops */
                if (!s) return (TERM_WHITE);
 
                /* Pick a random color */
@@ -352,7 +351,7 @@ u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, EFFECT_ID typ)
  * uses fewer than "range" grids for the projection path, so the result
  * of this function should never be compared directly to "range".  Note
  * that the initial grid (y1,x1) is never saved into the grid array, not
- * even if the initial grid is also the final grid.  XXX XXX XXX
+ * even if the initial grid is also the final grid.  
  *
  * The "flg" flags can be used to modify the behavior of this function.
  *
@@ -366,7 +365,7 @@ u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, EFFECT_ID typ)
  * that the path should be "angled" slightly if needed to avoid any wall
  * grids, allowing the player to "target" any grid which is in "view".
  * This flag is non-trivial and has not yet been implemented, but could
- * perhaps make use of the "vinfo" array (above).  XXX XXX XXX
+ * perhaps make use of the "vinfo" array (above).  
  *
  * This function returns the number of grids (if any) in the path.  This
  * function will return zero if and only if (y1,x1) and (y2,x2) are equal.
@@ -700,9 +699,9 @@ static POSITION monster_target_y; /*!< モンスターの攻撃目標Y座標 */
  *
  * We return "TRUE" if the effect of the projection is "obvious".
  *
- * XXX XXX XXX We also "see" grids which are "memorized", probably a hack
+ * We also "see" grids which are "memorized", probably a hack
  *
- * XXX XXX XXX Perhaps we should affect doors?
+ * Perhaps we should affect doors?
  * </pre>
  */
 static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ)
@@ -714,7 +713,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        bool known = player_has_los_bold(y, x);
 
 
-       /* XXX XXX XXX */
        who = who ? who : 0;
 
        /* Reduce damage by distance */
@@ -906,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 */
@@ -998,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 */
@@ -1077,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 */
@@ -1141,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);
                                }
 
@@ -1150,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 */
@@ -1265,7 +1258,7 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
  * Note that we determine if the player can "see" anything that happens
  * by taking into account: blindness, line-of-sight, and illumination.
  *
- * XXX XXX XXX We also "see" grids which are "memorized", probably a hack
+ * We also "see" grids which are "memorized", probably a hack
  *
  * We return "TRUE" if the effect of the projection is "obvious".
  * </pre>
@@ -1287,7 +1280,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        bool is_potion = FALSE;
 
 
-       /* XXX XXX XXX */
        who = who ? who : 0;
 
        /* Reduce damage by distance */
@@ -1486,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!"));
@@ -1620,7 +1611,7 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
  * </pre>
  * <pre>
  * Note that "polymorph" is dangerous, since a failure in "place_monster()"'
- * may result in a dereference of an invalid pointer.  XXX XXX XXX
+ * may result in a dereference of an invalid pointer.  
  * </pre>
  * <pre>
  * Various messages are produced, and damage is applied.
@@ -1750,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)
@@ -4866,7 +4857,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Generate treasure, etc */
                        monster_death(c_ptr->m_idx, FALSE);
 
-                       /* Delete the monster */
+
                        delete_monster_idx(c_ptr->m_idx);
 
                        if (sad)
@@ -5050,7 +5041,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                redraw_stuff();
        }
 
-       /* XXX XXX XXX Verify this code */
+       /* Verify this code */
 
        /* Update the monster */
        if (m_ptr->r_idx) update_mon(c_ptr->m_idx, FALSE);
@@ -5062,7 +5053,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        /* Update monster recall window */
        if ((p_ptr->monster_race_idx == m_ptr->r_idx) && (seen || !m_ptr->r_idx))
        {
-               /* Window stuff */
                p_ptr->window |= (PW_MONSTER);
        }
 
@@ -5221,11 +5211,10 @@ 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;
        }
 
-       /* XXX XXX XXX */
        /* Limit maximum damage */
        if (dam > 1600) dam = 1600;
 
@@ -5696,7 +5685,6 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
                                p_ptr->redraw |= PR_MAP;
                                /* Update monsters */
                                p_ptr->update |= (PU_MONSTERS);
-                               /* Window stuff */
                                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
                                /* Redraw status bar */
@@ -5999,7 +5987,6 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
                                /* Redraw mana */
                                p_ptr->redraw |= (PR_MANA);
 
-                               /* Window stuff */
                                p_ptr->window |= (PW_PLAYER);
                                p_ptr->window |= (PW_SPELL);
 
@@ -6240,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))
@@ -6283,7 +6269,7 @@ POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION
 
 
 /*
- * XXX XXX XXX
+ * 
  * Modified version of los() for calculation of disintegration balls.
  * Disintegration effects are stopped by permanent walls.
  */
@@ -6836,7 +6822,6 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                monster_desc(who_name, &m_list[who], MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
        }
 
-       /* Oops */
        else
        {
                x1 = x;