OSDN Git Service

[Refactor] #37353 monster1~monster-hook間整理。 / Refactor between monster1 and monster...
[hengband/hengband.git] / src / spells1.c
index e35cf96..a09fcdf 100644 (file)
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
+#include "trap.h"
+#include "object-curse.h"
+#include "player-damage.h"
+#include "monster-hook.h"
 
 
 static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */
@@ -85,14 +90,14 @@ static bool_hack common_saving_throw_control(player_type *player_ptr, HIT_POINT
 * ハードコーティングによる実装が行われている。
 * メイジは(レベル)%、ハイメイジ、スペルマスターは(レベル)%、それ以外の職業は(レベル/2)%
 */
-int beam_chance(void)
+PERCENTAGE beam_chance(void)
 {
        if (p_ptr->pclass == CLASS_MAGE)
-               return p_ptr->lev;
+               return (PERCENTAGE)(p_ptr->lev);
        if (p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER)
-               return p_ptr->lev + 10;
+               return (PERCENTAGE)(p_ptr->lev + 10);
 
-       return p_ptr->lev / 2;
+       return (PERCENTAGE)(p_ptr->lev / 2);
 }
 
 
@@ -108,7 +113,7 @@ static void next_mirror(int* next_y, int* next_x, int cury, int curx)
 {
        int mirror_x[10], mirror_y[10]; /* 鏡はもっと少ない */
        int mirror_num = 0;                       /* 鏡の数 */
-       int x, y;
+       POSITION x, y;
        int num;
 
        for (x = 0; x < cur_wid; x++)
@@ -140,7 +145,7 @@ static void next_mirror(int* next_y, int* next_x, int cury, int curx)
  * @param max 色IDの最大値
  * @return 選択した色ID
  */
-static byte mh_attr(int max)
+static TERM_COLOR mh_attr(int max)
 {
        switch (randint1(max))
        {
@@ -171,7 +176,7 @@ static byte mh_attr(int max)
  * @param type 魔法属性
  * @return 対応する色ID
  */
-static byte spell_color(int type)
+static TERM_COLOR spell_color(int type)
 {
        /* Check if A.B.'s new graphics should be used (rr9) */
        if (streq(ANGBAND_GRAF, "new") || streq(ANGBAND_GRAF, "ne2"))
@@ -239,13 +244,12 @@ static byte spell_color(int type)
        /* Normal tiles or ASCII */
        else
        {
-               byte a;
-               char c;
+               TERM_COLOR a;
+               SYMBOL_CODE c;
 
                /* Lookup the default colors for this type */
                cptr s = quark_str(gf_color[type]);
 
-               /* Oops */
                if (!s) return (TERM_WHITE);
 
                /* Pick a random color */
@@ -282,14 +286,14 @@ static byte spell_color(int type)
  * If the distance is not "one", we (may) return "*".
  * </pre>
  */
-u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ)
+u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, EFFECT_ID typ)
 {
        int base;
 
        byte k;
 
-       byte a;
-       char c;
+       TERM_COLOR a;
+       SYMBOL_CODE c;
 
        /* No motion (*) */
        if ((ny == y) && (nx == x)) base = 0x30;
@@ -349,7 +353,7 @@ u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int 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.
  *
@@ -363,7 +367,7 @@ u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int 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.
@@ -374,16 +378,16 @@ u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ)
  */
 sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, BIT_FLAGS flg)
 {
-       int y, x;
+       POSITION y, x;
 
        int n = 0;
        int k = 0;
 
        /* Absolute */
-       int ay, ax;
+       POSITION ay, ax;
 
        /* Offsets */
-       int sy, sx;
+       POSITION sy, sx;
 
        /* Fractions */
        int frac;
@@ -697,21 +701,20 @@ 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(int who, int r, int y, int x, HIT_POINT dam, int typ)
+static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ)
 {
-       cave_type          *c_ptr = &cave[y][x];
-       feature_type    *f_ptr = &f_info[c_ptr->feat];
+       cave_type *c_ptr = &cave[y][x];
+       feature_type *f_ptr = &f_info[c_ptr->feat];
 
        bool obvious = FALSE;
        bool known = player_has_los_bold(y, x);
 
 
-       /* XXX XXX XXX */
        who = who ? who : 0;
 
        /* Reduce damage by distance */
@@ -751,7 +754,7 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
                case GF_GRAVITY:
                        message = _("粉砕された", "was crushed."); break;
                default:
-                       message = NULL;break;
+                       message = NULL; break;
                }
                if (message)
                {
@@ -851,10 +854,7 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
                        if (!p_ptr->blind && player_has_los_bold(y, x))
                        {
                                c_ptr->info &= ~(CAVE_UNSAFE);
-
-                               /* Redraw */
                                lite_spot(y, x);
-
                                obvious = TRUE;
                        }
 
@@ -870,7 +870,6 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
                                /* Check line of sight */
                                if (known)
                                {
-                                       /* Message */
                                        msg_print(_("まばゆい閃光が走った!", "There is a bright flash of light!"));
                                        obvious = TRUE;
                                }
@@ -883,10 +882,7 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
                        if (!p_ptr->blind && player_has_los_bold(y, x))
                        {
                                c_ptr->info &= ~(CAVE_UNSAFE);
-
-                               /* Redraw */
                                lite_spot(y, x);
-
                                obvious = TRUE;
                        }
 
@@ -901,19 +897,14 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
                                feature_type *mimic_f_ptr = &f_info[get_feat_mimic(c_ptr)];
 
                                cave_alter_feat(y, x, FF_SPIKE);
-
                                c_ptr->mimic = old_mimic;
 
-                               /* Notice */
                                note_spot(y, x);
-
-                               /* Redraw */
                                lite_spot(y, x);
 
                                /* Check line of sight */
                                if (known && have_flag(mimic_f_ptr->flags, FF_OPEN))
                                {
-                                       /* Message */
                                        msg_format(_("%sに何かがつっかえて開かなくなった。", "The %s seems stuck."), f_name + mimic_f_ptr->name);
                                        obvious = TRUE;
                                }
@@ -926,7 +917,6 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
                {
                        if (have_flag(f_ptr->flags, FF_HURT_ROCK))
                        {
-                               /* Message */
                                if (known && (c_ptr->info & (CAVE_MARK)))
                                {
                                        msg_format(_("%sが溶けて泥になった!", "The %s turns into mud!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
@@ -998,10 +988,8 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
                        c_ptr->info |= CAVE_OBJECT;
                        c_ptr->mimic = feat_glyph;
 
-                       /* Notice */
                        note_spot(y, x);
 
-                       /* Redraw */
                        lite_spot(y, x);
 
                        break;
@@ -1076,13 +1064,8 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
                        if (!(d_info[dungeon_type].flags1 & DF1_DARKNESS))
                        {
                                c_ptr->info |= (CAVE_GLOW);
-
-                               /* Notice */
                                note_spot(y, x);
-
-                               /* Redraw */
                                lite_spot(y, x);
-
                                update_local_illumination(y, x);
 
                                /* Observe */
@@ -1090,7 +1073,7 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
 
                                /* Mega-Hack -- Update the monster in the affected grid */
                                /* This allows "spear of light" (etc) to work "correctly" */
-                               if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
+                               if (c_ptr->m_idx) update_monster(c_ptr->m_idx, FALSE);
 
                                if (p_ptr->special_defense & NINJA_S_STEALTH)
                                {
@@ -1141,21 +1124,18 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
                                        /* Forget */
                                        c_ptr->info &= ~(CAVE_MARK);
 
-                                       /* Notice */
                                        note_spot(y, x);
                                }
 
-                               /* Redraw */
                                lite_spot(y, x);
 
                                update_local_illumination(y, x);
 
-                               /* Notice */
                                if (player_can_see_bold(y, x)) obvious = TRUE;
 
                                /* Mega-Hack -- Update the monster in the affected grid */
                                /* This allows "spear of light" (etc) to work "correctly" */
-                               if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
+                               if (c_ptr->m_idx) update_monster(c_ptr->m_idx, FALSE);
                        }
 
                        /* All done */
@@ -1175,7 +1155,6 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
 
                        if (have_flag(f_ptr->flags, FF_GLASS) && !have_flag(f_ptr->flags, FF_PERMANENT) && (dam >= 50))
                        {
-                               /* Message */
                                if (known && (c_ptr->info & CAVE_MARK))
                                {
                                        msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
@@ -1203,7 +1182,6 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
 
                        if (have_flag(f_ptr->flags, FF_GLASS) && !have_flag(f_ptr->flags, FF_PERMANENT) && (dam >= 200))
                        {
-                               /* Message */
                                if (known && (c_ptr->info & CAVE_MARK))
                                {
                                        msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
@@ -1267,12 +1245,12 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
  * 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>
  */
-static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, int typ)
+static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ)
 {
        cave_type *c_ptr = &cave[y][x];
 
@@ -1289,7 +1267,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 */
@@ -1299,7 +1276,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        /* Scan all objects in the grid */
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
-               /* Acquire object */
                object_type *o_ptr = &o_list[this_o_idx];
 
                bool is_art = FALSE;
@@ -1488,7 +1464,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!"));
@@ -1569,9 +1544,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                                k_idx = o_ptr->k_idx;
                                is_potion = object_is_potion(o_ptr);
-
-
-                               /* Delete the object */
                                delete_object_idx(this_o_idx);
 
                                /* Potions produce effects when 'shattered' */
@@ -1580,7 +1552,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                        (void)potion_smash_effect(who, y, x, k_idx);
                                }
 
-                               /* Redraw */
                                lite_spot(y, x);
                        }
                }
@@ -1622,7 +1593,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.
@@ -1659,7 +1630,7 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
  * "flg" was added.
  * </pre>
  */
-static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, int typ, BIT_FLAGS flg, bool see_s_msg)
+static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, bool see_s_msg)
 {
        int tmp;
 
@@ -1752,7 +1723,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)
@@ -3012,7 +2983,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        if (p_ptr->health_who == c_ptr->m_idx) p_ptr->redraw |= (PR_HEALTH);
                        if (p_ptr->riding == c_ptr->m_idx) p_ptr->redraw |= (PR_UHEALTH);
 
-                       /* Message */
                        note = _("は体力を回復したようだ。", " looks healthier.");
 
                        /* No "real" damage */
@@ -3721,7 +3691,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                        if (!resists_tele)
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Prepare to teleport */
@@ -3745,7 +3714,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect undead */
                        if (r_ptr->flags3 & (RF3_UNDEAD))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
@@ -3788,7 +3756,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect evil */
                        if (r_ptr->flags3 & (RF3_EVIL))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
@@ -3828,7 +3795,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                skipped = TRUE;
                                break;
                        }
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        /* Apply some fear */
@@ -3863,13 +3829,11 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect undead */
                        if (r_ptr->flags3 & (RF3_UNDEAD))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD);
 
-                               /* Message */
                                note = _("は身震いした。", " shudders.");
                                note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
@@ -3900,13 +3864,11 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect evil */
                        if (r_ptr->flags3 & (RF3_EVIL))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL);
 
-                               /* Message */
                                note = _("は身震いした。", " shudders.");
                                note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
@@ -3936,13 +3898,11 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect good */
                        if (r_ptr->flags3 & (RF3_GOOD))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD);
 
-                               /* Message */
                                note = _("は身震いした。", " shudders.");
                                note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
@@ -3972,10 +3932,8 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect non-undead */
                        if (monster_living(r_ptr))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
-                               /* Message */
                                note = _("は身震いした。", " shudders.");
                                note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
@@ -4005,13 +3963,11 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect demons */
                        if (r_ptr->flags3 & (RF3_DEMON))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON);
 
-                               /* Message */
                                note = _("は身震いした。", " shudders.");
                                note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
@@ -4038,10 +3994,8 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                dam = 0;
                                break;
                        }
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
-                       /* Message */
                        note = _("は身震いした。", " shudders.");
                        note_dies = _("はドロドロに溶けた!", " dissolves!");
                        break;
@@ -4086,7 +4040,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                }
                                else
                                {
-                                       /* Message */
                                        msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), m_name);
                                        (void)hp_player(dam);
                                }
@@ -4103,7 +4056,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                case GF_MIND_BLAST:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
                        if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
@@ -4154,7 +4106,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                case GF_BRAIN_SMASH:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
                        if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
@@ -4214,7 +4165,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                case GF_CAUSE_1:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
                        if (!who) msg_format(_("%sを指差して呪いをかけた。", "You point at %s and curse."), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
@@ -4238,7 +4188,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                case GF_CAUSE_2:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
                        if (!who) msg_format(_("%sを指差して恐ろしげに呪いをかけた。", "You point at %s and curse horribly."), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
@@ -4262,7 +4211,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                case GF_CAUSE_3:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
                        if (!who) msg_format(_("%sを指差し、恐ろしげに呪文を唱えた!", "You point at %s, incanting terribly!"), m_name);
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
@@ -4286,7 +4234,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                case GF_CAUSE_4:
                {
                        if (seen) obvious = TRUE;
-                       /* Message */
                        if (!who) 
                                msg_format(_("%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。", 
                                                         "You point at %s, screaming the word, 'DIE!'."), m_name);
@@ -4710,7 +4657,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) &&
                        !(r_ptr->flags3 & RF3_NO_STUN))
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        /* Get stunned */
@@ -4737,7 +4683,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                         !(r_ptr->flags3 & RF3_NO_CONF) &&
                         !(r_ptr->flagsr & RFR_EFF_RES_CHAO_MASK))
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        /* Already partially confused */
@@ -4763,7 +4708,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                if (do_time)
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        if (do_time >= m_ptr->maxhp) do_time = m_ptr->maxhp - 1;
@@ -4782,7 +4726,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                {
                        if (polymorph_monster(y, x))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Monster polymorphs */
@@ -4807,10 +4750,8 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                /* Handle "teleport" */
                if (do_dist)
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
-                       /* Message */
                        note = _("が消え去った!", " disappears!");
 
                        if (!who) chg_virtue(V_VALOUR, -1);
@@ -4883,7 +4824,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)
@@ -4962,10 +4903,8 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Take note */
                        if ((fear || do_fear) && seen)
                        {
-                               /* Sound */
                                sound(SOUND_FLEE);
 
-                               /* Message */
                                msg_format(_("%^sは恐怖して逃げ出した!", "%^s flees in terror!"), m_name);
                        }
 
@@ -5069,10 +5008,8 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                redraw_stuff();
        }
 
-       /* XXX XXX XXX Verify this code */
-
-       /* Update the monster */
-       if (m_ptr->r_idx) update_mon(c_ptr->m_idx, FALSE);
+       /* Verify this code */
+       if (m_ptr->r_idx) update_monster(c_ptr->m_idx, FALSE);
 
        /* Redraw the monster grid */
        lite_spot(y, x);
@@ -5081,7 +5018,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);
        }
 
@@ -5111,8 +5047,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        {
                object_type *q_ptr;
                object_type forge;
-
-               /* Get local object */
                q_ptr = &forge;
 
                /* Prepare to make a Blade of Chaos */
@@ -5160,7 +5094,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
  * We return "TRUE" if any "obvious" effects were observed.  XXX XXX Actually,
  * we just assume that the effects were obvious, for historical reasons.
  */
-static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, int typ, BIT_FLAGS flg, int monspell)
+static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, int monspell)
 {
        int k = 0;
        int rlev = 0;
@@ -5240,11 +5174,10 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
 
                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;
 
@@ -5715,7 +5648,6 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                p_ptr->redraw |= PR_MAP;
                                /* Update monsters */
                                p_ptr->update |= (PU_MONSTERS);
-                               /* Window stuff */
                                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
                                /* Redraw status bar */
@@ -6018,7 +5950,6 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                /* Redraw mana */
                                p_ptr->redraw |= (PR_MANA);
 
-                               /* Window stuff */
                                p_ptr->window |= (PW_PLAYER);
                                p_ptr->window |= (PW_SPELL);
 
@@ -6259,8 +6190,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
        }
 
 
-       /* Disturb */
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
 
 
        if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && who && (who != p_ptr->riding))
@@ -6302,7 +6232,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.
  */
@@ -6532,7 +6462,7 @@ bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
 /*
  * breath shape
  */
-void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int typ)
+void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, EFFECT_ID typ)
 {
        POSITION by = y1;
        POSITION bx = x1;
@@ -6545,13 +6475,13 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *g
 
        while (bdis <= mdis)
        {
-               int x, y;
+               POSITION x, y;
 
                if ((0 < dist) && (path_n < dist))
                {
-                       int ny = GRID_Y(path_g[path_n]);
-                       int nx = GRID_X(path_g[path_n]);
-                       int nd = distance(ny, nx, y1, x1);
+                       POSITION ny = GRID_Y(path_g[path_n]);
+                       POSITION nx = GRID_X(path_g[path_n]);
+                       POSITION nd = distance(ny, nx, y1, x1);
 
                        /* Get next base point */
                        if (bdis >= nd)
@@ -6761,7 +6691,7 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *g
  * and "update_view()" and "update_monsters()" need to be called.
  * </pre>
  */
-bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, BIT_FLAGS flg, int monspell)
+bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, int monspell)
 {
        int i, t, dist;
 
@@ -6825,8 +6755,8 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
        rakubadam_m = 0;
 
        /* Default target of monsterspell is player */
-       monster_target_y=p_ptr->y;
-       monster_target_x=p_ptr->x;
+       monster_target_y = p_ptr->y;
+       monster_target_x = p_ptr->x;
 
        /* Hack -- Jump to target */
        if (flg & (PROJECT_JUMP))
@@ -6855,7 +6785,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;
@@ -6921,8 +6850,6 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
        /* Calculate the projection path */
 
        path_n = project_path(path_g, (project_length ? project_length : MAX_RANGE), y1, x1, y2, x2, flg);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        /* Giga-Hack SEEKER & SUPER_RAY */
@@ -7707,7 +7634,6 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                /* Player affected one monster (without "jumping") */
                if (!who && (project_m_n == 1) && !jump)
                {
-                       /* Location */
                        x = project_m_x;
                        y = project_m_y;
 
@@ -7835,63 +7761,62 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
  * @param dam ダメージ量
  * @return 効果があったらTRUEを返す
  */
-bool binding_field( HIT_POINT dam )
+bool binding_field(HIT_POINT dam)
 {
-       int mirror_x[10],mirror_y[10]; /* 鏡はもっと少ない */
-       int mirror_num=0;                         /* 鏡の数 */
-       int x,y;
-       int centersign;
-       int x1,x2,y1,y2;
+       POSITION mirror_x[10], mirror_y[10]; /* 鏡はもっと少ない */
+       int mirror_num = 0;                       /* 鏡の数 */
+       POSITION x, y;
+       POSITION centersign;
+       POSITION x1, x2, y1, y2;
        u16b p;
-       int msec= delay_factor*delay_factor*delay_factor;
+       int msec = delay_factor*delay_factor*delay_factor;
 
        /* 三角形の頂点 */
-       int point_x[3];
-       int point_y[3];
+       POSITION point_x[3];
+       POSITION point_y[3];
 
        /* Default target of monsterspell is player */
-       monster_target_y=p_ptr->y;
-       monster_target_x=p_ptr->x;
+       monster_target_y = p_ptr->y;
+       monster_target_x = p_ptr->x;
 
-       for( x=0 ; x < cur_wid ; x++ )
+       for (x = 0; x < cur_wid; x++)
        {
-               for( y=0 ; y < cur_hgt ; y++ )
+               for (y = 0; y < cur_hgt; y++)
                {
-                       ifis_mirror_grid(&cave[y][x]) &&
-                               distance(p_ptr->y,p_ptr->x,y,x) <= MAX_RANGE &&
-                               distance(p_ptr->y,p_ptr->x,y,x) != 0 &&
-                               player_has_los_bold(y,x) &&
+                       if (is_mirror_grid(&cave[y][x]) &&
+                               distance(p_ptr->y, p_ptr->x, y, x) <= MAX_RANGE &&
+                               distance(p_ptr->y, p_ptr->x, y, x) != 0 &&
+                               player_has_los_bold(y, x) &&
                                projectable(p_ptr->y, p_ptr->x, y, x)
-                               ){
-                               mirror_y[mirror_num]=y;
-                               mirror_x[mirror_num]=x;
+                               ) {
+                               mirror_y[mirror_num] = y;
+                               mirror_x[mirror_num] = x;
                                mirror_num++;
                        }
                }
        }
 
-       if( mirror_num < 2 )return FALSE;
+       if (mirror_num < 2)return FALSE;
 
-       point_x[0] = randint0( mirror_num );
+       point_x[0] = randint0(mirror_num);
        do {
-         point_x[1] = randint0( mirror_num );
-       }
-       while( point_x[0] == point_x[1] );
-
-       point_y[0]=mirror_y[point_x[0]];
-       point_x[0]=mirror_x[point_x[0]];
-       point_y[1]=mirror_y[point_x[1]];
-       point_x[1]=mirror_x[point_x[1]];
-       point_y[2]=p_ptr->y;
-       point_x[2]=p_ptr->x;
-
-       x=point_x[0]+point_x[1]+point_x[2];
-       y=point_y[0]+point_y[1]+point_y[2];
-
-       centersign = (point_x[0]*3-x)*(point_y[1]*3-y)
-               - (point_y[0]*3-y)*(point_x[1]*3-x);
-       if( centersign == 0 )return FALSE;
-                               
+               point_x[1] = randint0(mirror_num);
+       } while (point_x[0] == point_x[1]);
+
+       point_y[0] = mirror_y[point_x[0]];
+       point_x[0] = mirror_x[point_x[0]];
+       point_y[1] = mirror_y[point_x[1]];
+       point_x[1] = mirror_x[point_x[1]];
+       point_y[2] = p_ptr->y;
+       point_x[2] = p_ptr->x;
+
+       x = point_x[0] + point_x[1] + point_x[2];
+       y = point_y[0] + point_y[1] + point_y[2];
+
+       centersign = (point_x[0] * 3 - x)*(point_y[1] * 3 - y)
+               - (point_y[0] * 3 - y)*(point_x[1] * 3 - x);
+       if (centersign == 0)return FALSE;
+
        x1 = point_x[0] < point_x[1] ? point_x[0] : point_x[1];
        x1 = x1 < point_x[2] ? x1 : point_x[2];
        y1 = point_y[0] < point_y[1] ? point_y[0] : point_y[1];
@@ -7902,78 +7827,78 @@ bool binding_field( HIT_POINT dam )
        y2 = point_y[0] > point_y[1] ? point_y[0] : point_y[1];
        y2 = y2 > point_y[2] ? y2 : point_y[2];
 
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                               centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                               centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
                                        /* Visual effects */
-                                       if(!(p_ptr->blind)
-                                          && panel_contains(y,x)){
-                                         p = bolt_pict(y,x,y,x, GF_MANA );
-                                         print_rel(PICT_C(p), PICT_A(p),y,x);
-                                         move_cursor_relative(y, x);
-                                         /*if (fresh_before)*/ Term_fresh();
-                                         Term_xtra(TERM_XTRA_DELAY, msec);
+                                       if (!(p_ptr->blind)
+                                               && panel_contains(y, x)) {
+                                               p = bolt_pict(y, x, y, x, GF_MANA);
+                                               print_rel(PICT_C(p), PICT_A(p), y, x);
+                                               move_cursor_relative(y, x);
+                                               /*if (fresh_before)*/ Term_fresh();
+                                               Term_xtra(TERM_XTRA_DELAY, msec);
                                        }
                                }
                        }
                }
        }
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                               centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                               centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
-                                       (void)project_f(0,0,y,x,dam,GF_MANA); 
+                                       (void)project_f(0, 0, y, x, dam, GF_MANA);
                                }
                        }
                }
        }
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                               centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                               centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
-                                       (void)project_o(0,0,y,x,dam,GF_MANA); 
+                                       (void)project_o(0, 0, y, x, dam, GF_MANA);
                                }
                        }
                }
        }
-       for( y=y1 ; y <=y2 ; y++ ){
-               for( x=x1 ; x <=x2 ; x++ ){
-                       if( centersign*( (point_x[0]-x)*(point_y[1]-y)
-                                        -(point_y[0]-y)*(point_x[1]-x)) >=0 &&
-                               centersign*( (point_x[1]-x)*(point_y[2]-y)
-                                        -(point_y[1]-y)*(point_x[2]-x)) >=0 &&
-                               centersign*( (point_x[2]-x)*(point_y[0]-y)
-                                        -(point_y[2]-y)*(point_x[0]-x)) >=0 )
+       for (y = y1; y <= y2; y++) {
+               for (x = x1; x <= x2; x++) {
+                       if (centersign*((point_x[0] - x)*(point_y[1] - y)
+                               - (point_y[0] - y)*(point_x[1] - x)) >= 0 &&
+                               centersign*((point_x[1] - x)*(point_y[2] - y)
+                                       - (point_y[1] - y)*(point_x[2] - x)) >= 0 &&
+                               centersign*((point_x[2] - x)*(point_y[0] - y)
+                                       - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
                                if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) {
-                                       (void)project_m(0,0,y,x,dam,GF_MANA,
-                                         (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP),TRUE);
+                                       (void)project_m(0, 0, y, x, dam, GF_MANA,
+                                               (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP), TRUE);
                                }
                        }
                }
        }
-       if( one_in_(7) ){
+       if (one_in_(7)) {
                msg_print(_("鏡が結界に耐えきれず、壊れてしまった。", "The field broke a mirror"));
-               remove_mirror(point_y[0],point_x[0]);
+               remove_mirror(point_y[0], point_x[0]);
        }
 
        return TRUE;
@@ -7984,22 +7909,22 @@ bool binding_field( HIT_POINT dam )
  * @param dam ダメージ量
  * @return 効果があったらTRUEを返す
  */
-void seal_of_mirror( HIT_POINT dam )
+void seal_of_mirror(HIT_POINT dam)
 {
-       int x,y;
+       POSITION x, y;
 
-       for( x = 0 ; x < cur_wid ; x++ )
+       for (x = 0; x < cur_wid; x++)
        {
-               for( y = 0 ; y < cur_hgt ; y++ )
+               for (y = 0; y < cur_hgt; y++)
                {
-                       ifis_mirror_grid(&cave[y][x]))
+                       if (is_mirror_grid(&cave[y][x]))
                        {
-                               if(project_m(0,0,y,x,dam,GF_GENOCIDE,
-                                                        (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP),TRUE))
+                               if (project_m(0, 0, y, x, dam, GF_GENOCIDE,
+                                       (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP), TRUE))
                                {
-                                       if( !cave[y][x].m_idx )
+                                       if (!cave[y][x].m_idx)
                                        {
-                                               remove_mirror(y,x);
+                                               remove_mirror(y, x);
                                        }
                                }
                        }