OSDN Git Service

[Refactor] #38861 cptr を concptrに改名 / rename cptr to concptr.
[hengband/hengband.git] / src / spells1.c
index 6636103..f23d6b4 100644 (file)
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
+#include "trap.h"
+#include "object-curse.h"
+#include "player-damage.h"
+#include "monsterrace-hook.h"
+#include "melee.h"
+#include "world.h"
 
-/* ToDo: Make this global */
-#define HURT_CHANCE 16 /*!< 属性攻撃を受けた際に能力値低下を起こす確率(1/X) / 1/x chance of reducing stats (for elemental attacks) */
 
 static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */
 static int rakubadam_p; /*!< 落馬した際のダメージ量 */
@@ -23,7 +28,7 @@ int project_length = 0; /*!< 投射の射程距離 */
 
 
 /*!
- * @brief モンスター魅了用セービングスロー共通部
+ * @brief モンスター魅了用セービングスロー共通部(汎用系)
  * @param pow 魅了パワー
  * @param m_ptr 対象モンスター
  * @return 魅了に抵抗したらTRUE
@@ -32,18 +37,72 @@ static bool_hack common_saving_throw_charm(player_type *player_ptr, HIT_POINT po
 {
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
-       if(r_ptr->flagsr & RFR_RES_ALL || p_ptr->inside_arena) return TRUE;
+       if(p_ptr->inside_arena) return TRUE;
 
-       pow += (adj_chr_chm[player_ptr->stat_ind[A_CHR]] - 1);
+       /* Memorize a flag */
+       if (r_ptr->flagsr & RFR_RES_ALL)
+       {
+               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
+               return TRUE;
+       }
+
+       if (r_ptr->flags3 & RF3_NO_CONF)
+       {
+               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
+               return TRUE;
+       }
 
+       if (r_ptr->flags1 & RF1_QUESTOR || m_ptr->mflag2 & MFLAG2_NOPET) return TRUE;
+
+       pow += (adj_chr_chm[player_ptr->stat_ind[A_CHR]] - 1);
        if((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) pow = pow * 2 / 3;
+       return (r_ptr->level > randint1((pow - 10) < 1 ? 1 : (pow - 10)) + 5);
+}
+
+/*!
+ * @brief モンスター服従用セービングスロー共通部(部族依存系)
+ * @param pow 服従パワー
+ * @param m_ptr 対象モンスター
+ * @return 服従に抵抗したらTRUE
+ */
+static bool_hack common_saving_throw_control(player_type *player_ptr, HIT_POINT pow, monster_type *m_ptr)
+{
+       monster_race *r_ptr = &r_info[m_ptr->r_idx];
+
+       if (p_ptr->inside_arena) return TRUE;
+
+       /* Memorize a flag */
+       if (r_ptr->flagsr & RFR_RES_ALL)
+       {
+               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
+               return TRUE;
+       }
+
+       if (r_ptr->flags1 & RF1_QUESTOR || m_ptr->mflag2 & MFLAG2_NOPET) return TRUE;
+
+       pow += adj_chr_chm[player_ptr->stat_ind[A_CHR]] - 1;
+       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) pow = pow * 2 / 3;
+       return (r_ptr->level > randint1((pow - 10) < 1 ? 1 : (pow - 10)) + 5);
+}
 
-       return (r_ptr->flags1 & RF1_QUESTOR) ||
-                       (r_ptr->flags3 & RF3_NO_CONF) ||
-                       (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                       (r_ptr->level > randint1((pow - 10) < 1 ? 1 : (pow - 10)) + 5);
+/*!
+* @brief 一部ボルト魔法のビーム化確率を算出する / Prepare standard probability to become beam for fire_bolt_or_beam()
+* @return ビーム化確率(%)
+* @details
+* ハードコーティングによる実装が行われている。
+* メイジは(レベル)%、ハイメイジ、スペルマスターは(レベル)%、それ以外の職業は(レベル/2)%
+*/
+PERCENTAGE beam_chance(void)
+{
+       if (p_ptr->pclass == CLASS_MAGE)
+               return (PERCENTAGE)(p_ptr->lev);
+       if (p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER)
+               return (PERCENTAGE)(p_ptr->lev + 10);
+
+       return (PERCENTAGE)(p_ptr->lev / 2);
 }
 
+
 /*!
  * @brief 配置した鏡リストの次を取得する /
  * Get another mirror. for SEEKER 
@@ -56,7 +115,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++)
@@ -88,7 +147,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))
        {
@@ -119,7 +178,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"))
@@ -187,13 +246,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]);
+               concptr s = quark_str(gf_color[type]);
 
-               /* Oops */
                if (!s) return (TERM_WHITE);
 
                /* Pick a random color */
@@ -230,14 +288,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;
@@ -297,7 +355,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.
  *
@@ -311,7 +369,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.
@@ -322,16 +380,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;
@@ -645,21 +703,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 */
@@ -668,7 +725,7 @@ static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ)
 
        if (have_flag(f_ptr->flags, FF_TREE))
        {
-               cptr message;
+               concptr message;
                switch (typ)
                {
                case GF_POIS:
@@ -699,7 +756,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)
                {
@@ -799,10 +856,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;
                        }
 
@@ -818,7 +872,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;
                                }
@@ -831,10 +884,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;
                        }
 
@@ -849,19 +899,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;
                                }
@@ -874,7 +919,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);
@@ -946,10 +990,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;
@@ -1024,13 +1066,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 */
@@ -1038,7 +1075,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)
                                {
@@ -1089,21 +1126,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 */
@@ -1123,7 +1157,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);
@@ -1151,7 +1184,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);
@@ -1215,12 +1247,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];
 
@@ -1231,13 +1263,12 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
        BIT_FLAGS flgs[TR_FLAG_SIZE];
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        KIND_OBJECT_IDX k_idx = 0;
        bool is_potion = FALSE;
 
 
-       /* XXX XXX XXX */
        who = who ? who : 0;
 
        /* Reduce damage by distance */
@@ -1247,14 +1278,13 @@ 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;
                bool ignore = FALSE;
                bool do_kill = FALSE;
 
-               cptr note_kill = NULL;
+               concptr note_kill = NULL;
 
 #ifndef JP
                /* Get the "plural"-ness */
@@ -1263,8 +1293,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                /* Acquire next object */
                next_o_idx = o_ptr->next_o_idx;
-
-               /* Extract the flags */
                object_flags(o_ptr, flgs);
 
                /* Check for artifact */
@@ -1436,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!"));
@@ -1517,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' */
@@ -1528,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);
                        }
                }
@@ -1570,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.
@@ -1607,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;
 
@@ -1662,21 +1685,21 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        bool heal_leper = FALSE;
 
        /* Hold the monster name */
-       char m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
        char m_poss[10];
 
        PARAMETER_VALUE photo = 0;
 
        /* Assume no note */
-       cptr note = NULL;
+       concptr note = NULL;
 
        /* Assume a default death */
-       cptr note_dies = extract_note_dies(real_r_ptr(m_ptr));
+       concptr note_dies = extract_note_dies(real_r_idx(m_ptr));
 
-       int ty = m_ptr->fy;
-       int tx = m_ptr->fx;
+       POSITION ty = m_ptr->fy;
+       POSITION tx = m_ptr->fx;
 
-       int caster_lev = (who > 0) ? r_info[caster_ptr->r_idx].level : (p_ptr->lev * 2);
+       DEPTH caster_lev = (who > 0) ? r_info[caster_ptr->r_idx].level : (p_ptr->lev * 2);
 
        /* Nobody here */
        if (!c_ptr->m_idx) return (FALSE);
@@ -1700,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)
@@ -2542,8 +2565,8 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        else if (dam > 0)
                        {
                                int b = damroll(5, dam) / 4;
-                               cptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana");
-                               cptr msg = _("あなたは%sの苦痛を%sに変換した!", 
+                               concptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana");
+                               concptr msg = _("あなたは%sの苦痛を%sに変換した!", 
                                         (seen ? "You convert %s's pain into %s!" : 
                                                         "You convert %ss pain into %s!"));
                                msg_format(msg, m_name, str);
@@ -2694,7 +2717,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        }
                        else
                        {
-                               if ((dam > 29) && (randint1(100) < dam))
+                               if (!common_saving_throw_charm(p_ptr, dam, m_ptr))
                                {
                                        note = _("があなたに隷属した。", " is in your thrall!");
                                        set_pet(m_ptr);
@@ -2763,7 +2786,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
-                       if (!monster_living(r_ptr))
+                       if (!monster_living(m_ptr->r_idx))
                        {
                                if (is_original_ap_and_seen(m_ptr))
                                {
@@ -2792,7 +2815,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
                        }
-                       if (!monster_living(r_ptr))
+                       if (!monster_living(m_ptr->r_idx))
                        {
                                if (is_original_ap_and_seen(m_ptr))
                                {
@@ -2960,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 */
@@ -3153,17 +3175,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        if (common_saving_throw_charm(p_ptr, dam, m_ptr))
                        {
 
-                               /* Memorize a flag */
-                               if (r_ptr->flagsr & RFR_RES_ALL)
-                               {
-                                       if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
-                               }
-
-                               if (r_ptr->flags3 & RF3_NO_CONF)
-                               {
-                                       if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
-                               }
-
                                /* Resist */
                                /* No obvious effect */
                                note = _("には効果がなかった。", " is unaffected.");
@@ -3195,7 +3206,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                case GF_CONTROL_UNDEAD:
                {
                        int vir;
-                       dam += (adj_chr_chm[p_ptr->stat_ind[A_CHR]] - 1);
                        if (seen) obvious = TRUE;
 
                        vir = virtue_number(V_UNLIFE);
@@ -3210,22 +3220,9 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                dam -= p_ptr->virtues[vir-1]/20;
                        }
 
-                       if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
-                       {
-                               note = _("には効果がなかった。", " is unaffected.");
-                               dam = 0;
-                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
-                               break;
-                       }
-
-                       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
-                               dam = dam * 2 / 3;
-
                        /* Attempt a saving throw */
-                       if ((r_ptr->flags1 & RF1_QUESTOR) ||
-                         (!(r_ptr->flags3 & RF3_UNDEAD)) ||
-                               (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                                (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                       if (common_saving_throw_control(p_ptr, dam, m_ptr) ||
+                               !(r_ptr->flags3 & RF3_UNDEAD))
                        {
                                /* No obvious effect */
                                note = _("には効果がなかった。", " is unaffected.");
@@ -3252,7 +3249,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                case GF_CONTROL_DEMON:
                {
                        int vir;
-                       dam += (adj_chr_chm[p_ptr->stat_ind[A_CHR]] - 1);
                        if (seen) obvious = TRUE;
 
                        vir = virtue_number(V_UNLIFE);
@@ -3267,26 +3263,12 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                dam -= p_ptr->virtues[vir-1]/20;
                        }
 
-                       if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
-                       {
-                               note = _("には効果がなかった。", " is unaffected.");
-                               dam = 0;
-                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
-                               break;
-                       }
-
-                       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
-                               dam = dam * 2 / 3;
-
                        /* Attempt a saving throw */
-                       if ((r_ptr->flags1 & RF1_QUESTOR) ||
-                         (!(r_ptr->flags3 & RF3_DEMON)) ||
-                               (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                                (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                       if (common_saving_throw_control(p_ptr, dam, m_ptr) ||
+                               !(r_ptr->flags3 & RF3_DEMON))
                        {
                                /* No obvious effect */
                                note = _("には効果がなかった。", " is unaffected.");
-
                                obvious = FALSE;
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
@@ -3310,8 +3292,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                case GF_CONTROL_ANIMAL:
                {
                        int vir;
-                       dam += (adj_chr_chm[p_ptr->stat_ind[A_CHR]] - 1);
-
                        if (seen) obvious = TRUE;
 
                        vir = virtue_number(V_NATURE);
@@ -3326,34 +3306,13 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                dam -= p_ptr->virtues[vir-1]/20;
                        }
 
-                       if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
-                       {
-                               note = _("には効果がなかった。", " is unaffected.");
-                               dam = 0;
-                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
-                               break;
-                       }
-
-                       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
-                               dam = dam * 2 / 3;
-
                        /* Attempt a saving throw */
-                       if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
-                         (!(r_ptr->flags3 & (RF3_ANIMAL))) ||
-                               (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                               (r_ptr->flags3 & (RF3_NO_CONF)) ||
-                               (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+                       if (common_saving_throw_control(p_ptr, dam, m_ptr) ||
+                               !(r_ptr->flags3 & RF3_ANIMAL))
                        {
-                               /* Memorize a flag */
-                               if (r_ptr->flags3 & (RF3_NO_CONF))
-                               {
-                                       if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
-                               }
-
                                /* Resist */
                                /* No obvious effect */
                                note = _("には効果がなかった。", " is unaffected.");
-
                                obvious = FALSE;
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
@@ -3366,7 +3325,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        {
                                note = _("はなついた。", " is tamed!");
                                set_pet(m_ptr);
-
                                if (r_ptr->flags3 & RF3_ANIMAL)
                                        chg_virtue(V_NATURE, 1);
                        }
@@ -3377,11 +3335,10 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                }
 
                /* Tame animal */
-               case GF_CONTROL_LIVING:
+               case GF_CHARM_LIVING:
                {
                        int vir;
 
-                       dam += (adj_chr_chm[p_ptr->stat_ind[A_CHR]] - 1);
                        vir = virtue_number(V_UNLIFE);
                        if (seen) obvious = TRUE;
 
@@ -3397,30 +3354,15 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                dam -= p_ptr->virtues[vir-1]/20;
                        }
 
-                       if (r_ptr->flags3 & (RF3_NO_CONF)) dam -= 30;
-                       if (dam < 1) dam = 1;
                        msg_format(_("%sを見つめた。", "You stare into %s."), m_name);
-                       if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
-                       {
-                               note = _("には効果がなかった。", " is unaffected.");
-                               dam = 0;
-                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
-                               break;
-                       }
-
-                       if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
-                               dam = dam * 2 / 3;
 
                        /* Attempt a saving throw */
-                       if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
-                               (m_ptr->mflag2 & MFLAG2_NOPET) ||
-                                !monster_living(r_ptr) ||
-                                ((r_ptr->level+10) > randint1(dam)))
+                       if (common_saving_throw_charm(p_ptr, dam, m_ptr) ||
+                               !monster_living(m_ptr->r_idx))
                        {
                                /* Resist */
                                /* No obvious effect */
                                note = _("には効果がなかった。", " is unaffected.");
-
                                obvious = FALSE;
                                if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
@@ -3433,7 +3375,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        {
                                note = _("を支配した。", " is tamed!");
                                set_pet(m_ptr);
-
                                if (r_ptr->flags3 & RF3_ANIMAL)
                                        chg_virtue(V_NATURE, 1);
                        }
@@ -3750,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 */
@@ -3774,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 */
@@ -3817,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 */
@@ -3857,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 */
@@ -3892,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!");
                        }
@@ -3929,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!");
                        }
@@ -3965,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!");
                        }
@@ -3999,12 +3930,10 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                break;
                        }
                        /* Only affect non-undead */
-                       if (monster_living(r_ptr))
+                       if (monster_living(m_ptr->r_idx))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
-                               /* Message */
                                note = _("は身震いした。", " shudders.");
                                note_dies = _("はドロドロに溶けた!", " dissolves!");
                        }
@@ -4034,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!");
                        }
@@ -4067,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;
@@ -4107,7 +4032,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                                /* Special message */
                                                if (see_s_msg)
                                                {
-                                                       /* Get the monster name */
                                                        monster_desc(killer, caster_ptr, 0);
                                                        msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), killer);
                                                }
@@ -4115,7 +4039,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);
                                }
@@ -4132,7 +4055,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)
@@ -4183,7 +4105,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)
@@ -4243,7 +4164,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)
@@ -4267,7 +4187,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)
@@ -4291,7 +4210,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)
@@ -4315,7 +4233,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);
@@ -4386,7 +4303,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        }
 
                        if (is_pet(m_ptr)) nokori_hp = m_ptr->maxhp * 4L;
-                       else if ((p_ptr->pclass == CLASS_BEASTMASTER) && monster_living(r_ptr))
+                       else if ((p_ptr->pclass == CLASS_BEASTMASTER) && monster_living(m_ptr->r_idx))
                                nokori_hp = m_ptr->maxhp * 3 / 10;
                        else
                                nokori_hp = m_ptr->maxhp * 3 / 20;
@@ -4739,7 +4656,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 */
@@ -4766,7 +4682,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 */
@@ -4792,7 +4707,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;
@@ -4811,7 +4725,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 */
@@ -4836,10 +4749,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);
@@ -4912,7 +4823,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)
@@ -4948,7 +4859,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                {
-                       char m2_name[80];
+                       char m2_name[MAX_NLEN];
 
                        monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name);
@@ -4988,13 +4899,9 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        if (((dam > 0) || get_angry) && !do_sleep)
                                anger_monster(m_ptr);
 
-                       /* Take note */
                        if ((fear || do_fear) && seen)
                        {
-                               /* Sound */
                                sound(SOUND_FLEE);
-
-                               /* Message */
                                msg_format(_("%^sは恐怖して逃げ出した!", "%^s flees in terror!"), m_name);
                        }
 
@@ -5054,7 +4961,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                if (pet) mode |= PM_FORCE_PET;
                                else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
 
-                               count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode);
+                               count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode, '\0');
                                if (!one_in_(6)) break;
                        }
                        case 23: case 24: case 25:
@@ -5069,7 +4976,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                int i = 0;
                                if (one_in_(13))
                                {
-                                       while (i < 6)
+                                       while (i < A_MAX)
                                        {
                                                do
                                                {
@@ -5095,13 +5002,11 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        {
                p_ptr->health_who = c_ptr->m_idx;
                p_ptr->redraw |= (PR_HEALTH);
-               redraw_stuff();
+               handle_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);
@@ -5110,7 +5015,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);
        }
 
@@ -5140,8 +5044,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 */
@@ -5151,8 +5053,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                /* Mark the item as fully known */
                q_ptr->ident |= (IDENT_MENTAL);
-
-               /* Drop it in the dungeon */
                (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
        }
 
@@ -5189,10 +5089,10 @@ 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, concptr 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;
+       DEPTH rlev = 0;
 
        /* Hack -- assume obvious */
        bool obvious = TRUE;
@@ -5207,13 +5107,13 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
        monster_type *m_ptr = NULL;
 
        /* Monster name (for attacks) */
-       char m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
 
        /* Monster name (for damage) */
        char killer[80];
 
        /* Hack -- messages */
-       cptr act = NULL;
+       concptr act = NULL;
 
        int get_damage = 0;
 
@@ -5269,11 +5169,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;
 
@@ -5287,12 +5186,8 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
 
        if (who > 0)
        {
-               /* Get the source monster */
                m_ptr = &m_list[who];
-               /* Extract the monster level */
                rlev = (((&r_info[m_ptr->r_idx])->level >= 1) ? (&r_info[m_ptr->r_idx])->level : 1);
-
-               /* Get the monster name */
                monster_desc(m_name, m_ptr, 0);
 
                /* Get the monster's real name (gotten before polymorph!) */
@@ -5363,8 +5258,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                        if (p_ptr->resist_pois) dam = (dam + 2) / 3;
                        if (double_resist) dam = (dam + 2) / 3;
 
-                       if ((!(double_resist || p_ptr->resist_pois)) &&
-                                one_in_(HURT_CHANCE) && !CHECK_MULTISHADOW())
+                       if ((!(double_resist || p_ptr->resist_pois)) && one_in_(HURT_CHANCE) && !CHECK_MULTISHADOW())
                        {
                                do_dec_stat(A_CON);
                        }
@@ -5465,9 +5359,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                (void)set_stun(p_ptr->stun + plus_stun);
                        }
 
-                       if (!(p_ptr->resist_fire ||
-                               IS_OPPOSE_FIRE() ||
-                               p_ptr->immune_fire))
+                       if (!(p_ptr->resist_fire || IS_OPPOSE_FIRE() || p_ptr->immune_fire))
                        {
                                inven_damage(set_acid_destroy, 3);
                        }
@@ -5741,15 +5633,9 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                msg_print(_("閃光のため非物質的な影の存在でいられなくなった。",
                                        "The light forces you out of your incorporeal shadow form."));
 
-                               p_ptr->redraw |= PR_MAP;
-                               /* Update monsters */
+                               p_ptr->redraw |= (PR_MAP | PR_STATUS);
                                p_ptr->update |= (PU_MONSTERS);
-                               /* Window stuff */
                                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
-
-                               /* Redraw status bar */
-                               p_ptr->redraw |= (PR_STATUS);
-
                        }
 
                        break;
@@ -5821,7 +5707,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                                msg_print(_("あなたは以前ほど力強くなくなってしまった...。", 
                                                                        "You're not as powerful as you used to be..."));
 
-                                               for (k = 0; k < 6; k++)
+                                               for (k = 0; k < A_MAX; k++)
                                                {
                                                        p_ptr->stat_cur[k] = (p_ptr->stat_cur[k] * 7) / 8;
                                                        if (p_ptr->stat_cur[k] < 3) p_ptr->stat_cur[k] = 3;
@@ -6043,13 +5929,8 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
                                }
 
                                learn_spell(monspell);
-
-                               /* Redraw mana */
                                p_ptr->redraw |= (PR_MANA);
-
-                               /* Window stuff */
-                               p_ptr->window |= (PW_PLAYER);
-                               p_ptr->window |= (PW_SPELL);
+                               p_ptr->window |= (PW_PLAYER | PW_SPELL);
 
                                if (who > 0)
                                {
@@ -6272,7 +6153,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
        if ((p_ptr->tim_eyeeye || hex_spelling(HEX_EYE_FOR_EYE))
                && (get_damage > 0) && !p_ptr->is_dead && (who > 0))
        {
-               char m_name_self[80];
+               GAME_TEXT m_name_self[80];
 
                /* hisself */
                monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
@@ -6288,8 +6169,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))
@@ -6331,33 +6211,19 @@ 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.
  */
 bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
 {
-       /* Delta */
-       POSITION dx, dy;
-
-       /* Absolute */
-       POSITION ax, ay;
-
-       /* Signs */
-       POSITION sx, sy;
-
-       /* Fractions */
-       POSITION qx, qy;
-
-       /* Scanners */
-       POSITION tx, ty;
-
-       /* Scale factors */
-       POSITION f1, f2;
-
-       /* Slope, or 1/Slope, of LOS */
-       POSITION m;
-
+       POSITION dx, dy; /* Delta */
+       POSITION ax, ay; /* Absolute */
+       POSITION sx, sy; /* Signs */
+       POSITION qx, qy; /* Fractions */
+       POSITION tx, ty; /* Scanners */
+       POSITION f1, f2; /* Scale factors */
+       POSITION m; /* Slope, or 1/Slope, of LOS */
 
        /* Extract the offset */
        dy = y2 - y1;
@@ -6367,15 +6233,12 @@ bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
        ay = ABS(dy);
        ax = ABS(dx);
 
-
        /* Handle adjacent (or identical) grids */
        if ((ax < 2) && (ay < 2)) return (TRUE);
 
-
        /* Paranoia -- require "safe" origin */
        /* if (!in_bounds(y1, x1)) return (FALSE); */
 
-
        /* Directly South/North */
        if (!dx)
        {
@@ -6426,12 +6289,10 @@ bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
                return (TRUE);
        }
 
-
        /* Extract some signs */
        sx = (dx < 0) ? -1 : 1;
        sy = (dy < 0) ? -1 : 1;
 
-
        /* Vertical "knights" */
        if (ax == 1)
        {
@@ -6450,7 +6311,6 @@ bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
                }
        }
 
-
        /* Calculate scale factor div 2 */
        f2 = (ax * ay);
 
@@ -6561,7 +6421,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;
@@ -6574,13 +6434,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)
@@ -6790,7 +6650,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;
 
@@ -6842,7 +6702,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
        bool jump = FALSE;
 
        /* Attacker's name (prepared before polymorph)*/
-       char who_name[80];
+       GAME_TEXT who_name[MAX_NLEN];
 
        /* Can the player see the source of this effect? */
        bool see_s_msg = TRUE;
@@ -6854,8 +6714,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))
@@ -6884,7 +6744,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;
@@ -6950,8 +6809,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 */
@@ -6991,8 +6848,8 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                {
                                        u16b p;
 
-                                       byte a;
-                                       char c;
+                                       TERM_COLOR a;
+                                       SYMBOL_CODE c;
 
                                        /* Obtain the bolt pict */
                                        p = bolt_pict(oy, ox, y, x, typ);
@@ -7034,50 +6891,50 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                        Term_xtra(TERM_XTRA_DELAY, msec);
                                }
                        }
-                       if(project_o(0,0,y,x,dam,GF_SEEKER))notice=TRUE;
-                       ifis_mirror_grid(&cave[y][x]))
+                       if (project_o(0, 0, y, x, dam, GF_SEEKER))notice = TRUE;
+                       if (is_mirror_grid(&cave[y][x]))
                        {
-                         /* The target of monsterspell becomes tha mirror(broken) */
-                               monster_target_y=(s16b)y;
-                               monster_target_x=(s16b)x;
+                               /* The target of monsterspell becomes tha mirror(broken) */
+                               monster_target_y = y;
+                               monster_target_x = x;
 
                                remove_mirror(y, x);
                                next_mirror(&oy, &ox, y, x);
 
-                               path_n = i+project_path(&(path_g[i+1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
-                               for(j = last_i; j <= i; j++)
+                               path_n = i + project_path(&(path_g[i + 1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
+                               for (j = last_i; j <= i; j++)
                                {
                                        y = GRID_Y(path_g[j]);
                                        x = GRID_X(path_g[j]);
-                                       if(project_m(0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice=TRUE;
-                                       if(!who && (project_m_n==1) && !jump ){
-                                         if(cave[project_m_y][project_m_x].m_idx >0 ){
-                                               monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
+                                       if (project_m(0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice = TRUE;
+                                       if (!who && (project_m_n == 1) && !jump) {
+                                               if (cave[project_m_y][project_m_x].m_idx > 0) {
+                                                       monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
 
-                                               if (m_ptr->ml)
-                                               {
-                                                 /* Hack -- auto-recall */
-                                                 if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
+                                                       if (m_ptr->ml)
+                                                       {
+                                                               /* Hack -- auto-recall */
+                                                               if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
 
-                                                 /* Hack - auto-track */
-                                                 health_track(cave[project_m_y][project_m_x].m_idx);
+                                                               /* Hack - auto-track */
+                                                               health_track(cave[project_m_y][project_m_x].m_idx);
+                                                       }
                                                }
-                                         }
                                        }
-                                       (void)project_f(0,0,y,x,dam,GF_SEEKER);
+                                       (void)project_f(0, 0, y, x, dam, GF_SEEKER);
                                }
                                last_i = i;
                        }
                }
                for(i = last_i ; i < path_n ; i++)
                {
-                       int py, px;
+                       POSITION py, px;
                        py = GRID_Y(path_g[i]);
                        px = GRID_X(path_g[i]);
-                       if(project_m(0, 0, py, px, dam, GF_SEEKER, flg, TRUE))
+                       if (project_m(0, 0, py, px, dam, GF_SEEKER, flg, TRUE))
                                notice = TRUE;
-                       if(!who && (project_m_n==1) && !jump ){
-                               if(cave[project_m_y][project_m_x].m_idx > 0)
+                       if (!who && (project_m_n == 1) && !jump) {
+                               if (cave[project_m_y][project_m_x].m_idx > 0)
                                {
                                        monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
 
@@ -7106,11 +6963,11 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
 
                for (i = 0; i < path_n; ++i)
                {
-                       int oy = y;
-                       int ox = x;
+                       POSITION oy = y;
+                       POSITION ox = x;
 
-                       int ny = GRID_Y(path_g[i]);
-                       int nx = GRID_X(path_g[i]);
+                       POSITION ny = GRID_Y(path_g[i]);
+                       POSITION nx = GRID_X(path_g[i]);
 
                        /* Advance */
                        y = ny;
@@ -7129,8 +6986,8 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                {
                                        u16b p;
 
-                                       byte a;
-                                       char c;
+                                       TERM_COLOR a;
+                                       SYMBOL_CODE c;
 
                                        /* Obtain the bolt pict */
                                        p = bolt_pict(oy, ox, y, x, typ);
@@ -7205,7 +7062,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                }
                for( i = 0; i < path_n ; i++ )
                {
-                       int py, px;
+                       POSITION py, px;
                        py = GRID_Y(path_g[i]);
                        px = GRID_X(path_g[i]);
                        (void)project_m(0, 0, py, px, dam, GF_SUPER_RAY, flg, TRUE);
@@ -7231,11 +7088,11 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
        /* Project along the path */
        for (i = 0; i < path_n; ++i)
        {
-               int oy = y;
-               int ox = x;
+               POSITION oy = y;
+               POSITION ox = x;
 
-               int ny = GRID_Y(path_g[i]);
-               int nx = GRID_X(path_g[i]);
+               POSITION ny = GRID_Y(path_g[i]);
+               POSITION nx = GRID_X(path_g[i]);
 
                if (flg & PROJECT_DISI)
                {
@@ -7273,8 +7130,8 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                        {
                                u16b p;
 
-                               byte a;
-                               char c;
+                               TERM_COLOR a;
+                               SYMBOL_CODE c;
 
                                /* Obtain the bolt pict */
                                p = bolt_pict(oy, ox, y, x, typ);
@@ -7435,8 +7292,8 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                {
                                        u16b p;
 
-                                       byte a;
-                                       char c;
+                                       TERM_COLOR a;
+                                       SYMBOL_CODE c;
 
                                        drawn = TRUE;
 
@@ -7490,10 +7347,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                }
        }
 
-
-       /* Update stuff if needed */
-       if (p_ptr->update) update_stuff();
-
+       update_creature(p_ptr);
 
        if (flg & PROJECT_KILL)
        {
@@ -7534,8 +7388,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                }
        }
 
-       /* Update stuff if needed */
-       if (p_ptr->update) update_stuff();
+       update_creature(p_ptr);
 
        /* Check objects */
        if (flg & (PROJECT_ITEM))
@@ -7736,7 +7589,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,7 +7687,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
 
        if (p_ptr->riding)
        {
-               char m_name[80];
+               GAME_TEXT m_name[MAX_NLEN];
 
                monster_desc(m_name, &m_list[p_ptr->riding], 0);
 
@@ -7864,63 +7716,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];
@@ -7931,78 +7782,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;
@@ -8013,22 +7864,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);
                                        }
                                }
                        }