X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fspells1.c;h=a09fcdf3e811f5db51ff715efcfc497233a6d876;hb=ef5fc5bd6d0b59af4087c2b1f741e8f24860604d;hp=49c32f41e6fbacabfc56cea4568d804cb639f1c9;hpb=2a38a1a8a8c0243b67e49ee08dd68595f5190772;p=hengband%2Fhengband.git

diff --git a/src/spells1.c b/src/spells1.c
index 49c32f41e..a09fcdf3e 100644
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -12,9 +12,12 @@
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
+#include "trap.h"
+#include "object-curse.h"
+#include "player-damage.h"
+#include "monster-hook.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,6 +26,82 @@ int project_length = 0; /*!< 投射の射程距離 */
 
 
 /*!
+ * @brief モンスター魅了用セービングスロー共通部(汎用系)
+ * @param pow 魅了パワー
+ * @param m_ptr 対象モンスター
+ * @return 魅了に抵抗したらTRUE
+ */
+static bool_hack common_saving_throw_charm(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->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);
+}
+
+/*!
+* @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 
  * @param next_y 次の鏡のy座標を返す参照ポインタ
@@ -30,33 +109,33 @@ int project_length = 0; /*!< 投射の射程距離 */
  * @param cury 現在の鏡のy座標
  * @param curx 現在の鏡のx座標
  */
-static void next_mirror( int* next_y , int* next_x , int cury, int curx)
+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;
+	int mirror_x[10], mirror_y[10]; /* 鏡はもっと少ない */
+	int mirror_num = 0;			  /* 鏡の数 */
+	POSITION x, y;
 	int num;
 
-	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++)
 		{
-			if( is_mirror_grid(&cave[y][x])){
-				mirror_y[mirror_num]=y;
-				mirror_x[mirror_num]=x;
+			if (is_mirror_grid(&cave[y][x])) {
+				mirror_y[mirror_num] = y;
+				mirror_x[mirror_num] = x;
 				mirror_num++;
 			}
 		}
 	}
-	if( mirror_num )
+	if (mirror_num)
 	{
-		num=randint0(mirror_num);
-		*next_y=mirror_y[num];
-		*next_x=mirror_x[num];
+		num = randint0(mirror_num);
+		*next_y = mirror_y[num];
+		*next_x = mirror_x[num];
 		return;
 	}
-	*next_y=cury+randint0(5)-2;
-	*next_x=curx+randint0(5)-2;
+	*next_y = cury + randint0(5) - 2;
+	*next_x = curx + randint0(5) - 2;
 	return;
 }
 		
@@ -66,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))
 	{
@@ -97,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"))
@@ -105,44 +184,44 @@ static byte spell_color(int type)
 		/* Analyze */
 		switch (type)
 		{
-			case GF_PSY_SPEAR:      return (0x06);
-			case GF_MISSILE:        return (0x0F);
-			case GF_ACID:           return (0x04);
-			case GF_ELEC:           return (0x02);
-			case GF_FIRE:           return (0x00);
-			case GF_COLD:           return (0x01);
-			case GF_POIS:           return (0x03);
-			case GF_HOLY_FIRE:      return (0x00);
-			case GF_HELL_FIRE:      return (0x00);
-			case GF_MANA:           return (0x0E);
+			case GF_PSY_SPEAR:		return (0x06);
+			case GF_MISSILE:		return (0x0F);
+			case GF_ACID:			return (0x04);
+			case GF_ELEC:			return (0x02);
+			case GF_FIRE:			return (0x00);
+			case GF_COLD:			return (0x01);
+			case GF_POIS:			return (0x03);
+			case GF_HOLY_FIRE:		return (0x00);
+			case GF_HELL_FIRE:		return (0x00);
+			case GF_MANA:			return (0x0E);
 			  /* by henkma */
-			case GF_SEEKER:         return (0x0E);
-			case GF_SUPER_RAY:      return (0x0E);
-
-			case GF_ARROW:          return (0x0F);
-			case GF_WATER:          return (0x04);
-			case GF_NETHER:         return (0x07);
-			case GF_CHAOS:          return (mh_attr(15));
-			case GF_DISENCHANT:     return (0x05);
-			case GF_NEXUS:          return (0x0C);
-			case GF_CONFUSION:      return (mh_attr(4));
-			case GF_SOUND:          return (0x09);
-			case GF_SHARDS:         return (0x08);
-			case GF_FORCE:          return (0x09);
-			case GF_INERTIA:        return (0x09);
-			case GF_GRAVITY:        return (0x09);
-			case GF_TIME:           return (0x09);
-			case GF_LITE_WEAK:      return (0x06);
-			case GF_LITE:           return (0x06);
-			case GF_DARK_WEAK:      return (0x07);
-			case GF_DARK:           return (0x07);
-			case GF_PLASMA:         return (0x0B);
-			case GF_METEOR:         return (0x00);
-			case GF_ICE:            return (0x01);
-			case GF_ROCKET:         return (0x0F);
-			case GF_DEATH_RAY:      return (0x07);
-			case GF_NUKE:           return (mh_attr(2));
-			case GF_DISINTEGRATE:   return (0x05);
+			case GF_SEEKER:			return (0x0E);
+			case GF_SUPER_RAY:		return (0x0E);
+
+			case GF_ARROW:			return (0x0F);
+			case GF_WATER:			return (0x04);
+			case GF_NETHER:			return (0x07);
+			case GF_CHAOS:			return (mh_attr(15));
+			case GF_DISENCHANT:		return (0x05);
+			case GF_NEXUS:			return (0x0C);
+			case GF_CONFUSION:		return (mh_attr(4));
+			case GF_SOUND:			return (0x09);
+			case GF_SHARDS:			return (0x08);
+			case GF_FORCE:			return (0x09);
+			case GF_INERTIAL:		return (0x09);
+			case GF_GRAVITY:		return (0x09);
+			case GF_TIME:			return (0x09);
+			case GF_LITE_WEAK:		return (0x06);
+			case GF_LITE:			return (0x06);
+			case GF_DARK_WEAK:		return (0x07);
+			case GF_DARK:			return (0x07);
+			case GF_PLASMA:			return (0x0B);
+			case GF_METEOR:			return (0x00);
+			case GF_ICE:			return (0x01);
+			case GF_ROCKET:			return (0x0F);
+			case GF_DEATH_RAY:		return (0x07);
+			case GF_NUKE:			return (mh_attr(2));
+			case GF_DISINTEGRATE:	return (0x05);
 			case GF_PSI:
 			case GF_PSI_DRAIN:
 			case GF_TELEKINESIS:
@@ -150,28 +229,27 @@ static byte spell_color(int type)
 			case GF_DRAIN_MANA:
 			case GF_MIND_BLAST:
 			case GF_BRAIN_SMASH:
-						return (0x09);
+				return (0x09);
 			case GF_CAUSE_1:
 			case GF_CAUSE_2:
 			case GF_CAUSE_3:
-			case GF_CAUSE_4:        return (0x0E);
-			case GF_HAND_DOOM:      return (0x07);
-			case GF_CAPTURE  :      return (0x0E);
-			case GF_IDENTIFY:       return (0x01);
-			case GF_ATTACK:        return (0x0F);
-			case GF_PHOTO   :      return (0x06);
+			case GF_CAUSE_4:		return (0x0E);
+			case GF_HAND_DOOM:		return (0x07);
+			case GF_CAPTURE  :		return (0x0E);
+			case GF_IDENTIFY:		return (0x01);
+			case GF_ATTACK:			return (0x0F);
+			case GF_PHOTO   :		return (0x06);
 		}
 	}
 	/* 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 */
@@ -200,6 +278,7 @@ static byte spell_color(int type)
  * @param x 始点X座標
  * @param ny 終点Y座標
  * @param nx 終点X座標
+ * @param typ 魔法の効果属性
  * @return 方向キャラID
  * @details
  * <pre>
@@ -207,14 +286,14 @@ static byte spell_color(int type)
  * If the distance is not "one", we (may) return "*".
  * </pre>
  */
-u16b bolt_pict(int y, int x, int ny, int 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;
@@ -274,7 +353,7 @@ u16b bolt_pict(int y, int x, int ny, int 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.
  *
@@ -288,7 +367,7 @@ u16b bolt_pict(int y, int x, int ny, int 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.
@@ -297,18 +376,18 @@ u16b bolt_pict(int y, int x, int ny, int nx, int typ)
  * by "update_view_los()", and very different from the one used by "los()".
  * </pre>
  */
-sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg)
+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;
@@ -411,7 +490,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg)
 			if (flg & (PROJECT_STOP))
 			{
 				if ((n > 0) &&
-				    (player_bold(y, x) || cave[y][x].m_idx != 0))
+					(player_bold(y, x) || cave[y][x].m_idx != 0))
 					break;
 			}
 
@@ -500,7 +579,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg)
 			if (flg & (PROJECT_STOP))
 			{
 				if ((n > 0) &&
-				    (player_bold(y, x) || cave[y][x].m_idx != 0))
+					(player_bold(y, x) || cave[y][x].m_idx != 0))
 					break;
 			}
 
@@ -571,7 +650,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg)
 			if (flg & (PROJECT_STOP))
 			{
 				if ((n > 0) &&
-				    (player_bold(y, x) || cave[y][x].m_idx != 0))
+					(player_bold(y, x) || cave[y][x].m_idx != 0))
 					break;
 			}
 
@@ -595,11 +674,11 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg)
  * Mega-Hack -- track "affected" monsters (see "project()" comments)
  */
 static int project_m_n; /*!< 魔法効果範囲内にいるモンスターの数 */
-static int project_m_x; /*!< 処理中のモンスターX座標 */
-static int project_m_y; /*!< 処理中のモンスターY座標 */
+static POSITION project_m_x; /*!< 処理中のモンスターX座標 */
+static POSITION project_m_y; /*!< 処理中のモンスターY座標 */
 /* Mega-Hack -- monsters target */
-static s16b monster_target_x; /*!< モンスターの攻撃目標X座標 */
-static s16b monster_target_y; /*!< モンスターの攻撃目標Y座標 */
+static POSITION monster_target_x; /*!< モンスターの攻撃目標X座標 */
+static POSITION monster_target_y; /*!< モンスターの攻撃目標Y座標 */
 
 
 /*!
@@ -622,21 +701,20 @@ static s16b 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, int 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 */
@@ -651,18 +729,18 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 		case GF_POIS:
 		case GF_NUKE:
 		case GF_DEATH_RAY:
-            message = _("枯れた", "was blasted."); break;
+			message = _("枯れた", "was blasted."); break;
 		case GF_TIME:
-            message = _("縮んだ", "shrank."); break;
+			message = _("縮んだ", "shrank."); break;
 		case GF_ACID:
-            message = _("溶けた", "melted."); break;
+			message = _("溶けた", "melted."); break;
 		case GF_COLD:
 		case GF_ICE:
-            message = _("凍り、砕け散った", "was frozen and smashed."); break;
+			message = _("凍り、砕け散った", "was frozen and smashed."); break;
 		case GF_FIRE:
 		case GF_ELEC:
 		case GF_PLASMA:
-            message = _("燃えた", "burns up!"); break;
+			message = _("燃えた", "burns up!"); break;
 		case GF_METEOR:
 		case GF_CHAOS:
 		case GF_MANA:
@@ -674,13 +752,13 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 		case GF_DISENCHANT:
 		case GF_FORCE:
 		case GF_GRAVITY:
-            message = _("粉砕された", "was crushed."); break;
+			message = _("粉砕された", "was crushed."); break;
 		default:
-			message = NULL;break;
+			message = NULL; break;
 		}
 		if (message)
 		{
-            msg_format(_("木は%s。", "A tree %s"), message);
+			msg_format(_("木は%s。", "A tree %s"), message);
 			cave_set_feat(y, x, one_in_(3) ? feat_brake : feat_grass);
 
 			/* Observe */
@@ -748,7 +826,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 				/* Check line of sight */
 				if (known)
 				{
-                    msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!"));
+					msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!"));
 					obvious = TRUE;
 				}
 
@@ -767,7 +845,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 				/* Check line of sound */
 				if (known && (old_feat != c_ptr->feat))
 				{
-                    msg_print(_("カチッと音がした！", "Click!"));
+					msg_print(_("カチッと音がした！", "Click!"));
 					obvious = TRUE;
 				}
 			}
@@ -776,10 +854,7 @@ static bool project_f(int who, int r, int y, int x, int 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;
 			}
 
@@ -795,8 +870,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 				/* Check line of sight */
 				if (known)
 				{
-					/* Message */
-                    msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!"));
+					msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!"));
 					obvious = TRUE;
 				}
 
@@ -808,10 +882,7 @@ static bool project_f(int who, int r, int y, int x, int 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;
 			}
 
@@ -826,20 +897,15 @@ static bool project_f(int who, int r, int y, int x, int 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);
+					msg_format(_("%sに何かがつっかえて開かなくなった。", "The %s seems stuck."), f_name + mimic_f_ptr->name);
 					obvious = TRUE;
 				}
 			}
@@ -851,10 +917,9 @@ static bool project_f(int who, int r, int y, int x, int 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);
+					msg_format(_("%sが溶けて泥になった！", "The %s turns into mud!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
 					obvious = TRUE;
 				}
 
@@ -923,10 +988,8 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 			c_ptr->info |= CAVE_OBJECT;
 			c_ptr->mimic = feat_glyph;
 
-			/* Notice */
 			note_spot(y, x);
 
-			/* Redraw */
 			lite_spot(y, x);
 
 			break;
@@ -1001,13 +1064,8 @@ static bool project_f(int who, int r, int y, int x, int 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 */
@@ -1015,7 +1073,7 @@ static bool project_f(int who, int r, int y, int x, int 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)
 				{
@@ -1066,21 +1124,18 @@ static bool project_f(int who, int r, int y, int x, int 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 */
@@ -1092,7 +1147,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 		{
 			if (is_mirror_grid(c_ptr))
 			{
-                msg_print(_("鏡が割れた！", "The mirror was crashed!"));
+				msg_print(_("鏡が割れた！", "The mirror was crashed!"));
 				sound(SOUND_GLASS);
 				remove_mirror(y, x);
 				project(0, 2, y, x, p_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
@@ -1100,10 +1155,9 @@ static bool project_f(int who, int r, int y, int x, int 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);
+					msg_format(_("%sが割れた！", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
 					sound(SOUND_GLASS);
 				}
 
@@ -1119,8 +1173,8 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
 		case GF_SOUND:
 		{
 			if (is_mirror_grid(c_ptr) && p_ptr->lev < 40)
-            {
-                msg_print(_("鏡が割れた！", "The mirror was crashed!"));
+			{
+				msg_print(_("鏡が割れた！", "The mirror was crashed!"));
 				sound(SOUND_GLASS);
 				remove_mirror(y, x);
 				project(0, 2, y, x, p_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
@@ -1128,10 +1182,9 @@ static bool project_f(int who, int r, int y, int x, int 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);
+					msg_format(_("%sが割れた！", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name);
 					sound(SOUND_GLASS);
 				}
 
@@ -1192,29 +1245,28 @@ static bool project_f(int who, int r, int y, int x, int 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(int who, int r, int y, int x, int 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];
 
-	s16b this_o_idx, next_o_idx = 0;
+	OBJECT_IDX this_o_idx, next_o_idx = 0;
 
 	bool obvious = FALSE;
 	bool known = player_has_los_bold(y, x);
 
-	u32b flgs[TR_FLAG_SIZE];
+	BIT_FLAGS flgs[TR_FLAG_SIZE];
 
 	char o_name[MAX_NLEN];
 
-	int k_idx = 0;
+	KIND_OBJECT_IDX k_idx = 0;
 	bool is_potion = FALSE;
 
 
-	/* XXX XXX XXX */
 	who = who ? who : 0;
 
 	/* Reduce damage by distance */
@@ -1224,7 +1276,6 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 	/* 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;
@@ -1256,7 +1307,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 				if (hates_acid(o_ptr))
 				{
 					do_kill = TRUE;
-                    note_kill = _("融けてしまった！", (plural ? " melt!" : " melts!"));
+					note_kill = _("融けてしまった！", (plural ? " melt!" : " melts!"));
 					if (have_flag(flgs, TR_IGNORE_ACID)) ignore = TRUE;
 				}
 				break;
@@ -1268,7 +1319,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 				if (hates_elec(o_ptr))
 				{
 					do_kill = TRUE;
-                    note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!"));
+					note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!"));
 					if (have_flag(flgs, TR_IGNORE_ELEC)) ignore = TRUE;
 				}
 				break;
@@ -1279,8 +1330,8 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 			{
 				if (hates_fire(o_ptr))
 				{
-                    do_kill = TRUE;
-                    note_kill = _("燃えてしまった！", (plural ? " burn up!" : " burns up!"));
+					do_kill = TRUE;
+					note_kill = _("燃えてしまった！", (plural ? " burn up!" : " burns up!"));
 					if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE;
 				}
 				break;
@@ -1291,7 +1342,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 			{
 				if (hates_cold(o_ptr))
 				{
-                    note_kill = _("砕け散ってしまった！", (plural ? " shatter!" : " shatters!"));
+					note_kill = _("砕け散ってしまった！", (plural ? " shatter!" : " shatters!"));
 					do_kill = TRUE;
 					if (have_flag(flgs, TR_IGNORE_COLD)) ignore = TRUE;
 				}
@@ -1304,14 +1355,14 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 				if (hates_fire(o_ptr))
 				{
 					do_kill = TRUE;
-                    note_kill = _("燃えてしまった！", (plural ? " burn up!" : " burns up!"));
+					note_kill = _("燃えてしまった！", (plural ? " burn up!" : " burns up!"));
 					if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE;
 				}
 				if (hates_elec(o_ptr))
 				{
 					ignore = FALSE;
 					do_kill = TRUE;
-                    note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!"));
+					note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!"));
 					if (have_flag(flgs, TR_IGNORE_ELEC)) ignore = TRUE;
 				}
 				break;
@@ -1322,15 +1373,15 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 			{
 				if (hates_fire(o_ptr))
 				{
-                    do_kill = TRUE;
-                    note_kill = _("燃えてしまった！", (plural ? " burn up!" : " burns up!"));
+					do_kill = TRUE;
+					note_kill = _("燃えてしまった！", (plural ? " burn up!" : " burns up!"));
 					if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE;
 				}
 				if (hates_cold(o_ptr))
 				{
 					ignore = FALSE;
 					do_kill = TRUE;
-                    note_kill = _("砕け散ってしまった！", (plural ? " shatter!" : " shatters!"));
+					note_kill = _("砕け散ってしまった！", (plural ? " shatter!" : " shatters!"));
 					if (have_flag(flgs, TR_IGNORE_COLD)) ignore = TRUE;
 				}
 				break;
@@ -1343,8 +1394,8 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 			case GF_SOUND:
 			{
 				if (hates_cold(o_ptr))
-                {
-                    note_kill = _("砕け散ってしまった！", (plural ? " shatter!" : " shatters!"));
+				{
+					note_kill = _("砕け散ってしまった！", (plural ? " shatter!" : " shatters!"));
 					do_kill = TRUE;
 				}
 				break;
@@ -1356,21 +1407,21 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 			case GF_SUPER_RAY:
 			{
 				do_kill = TRUE;
-                note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!"));
+				note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!"));
 				break;
 			}
 
 			case GF_DISINTEGRATE:
 			{
 				do_kill = TRUE;
-                note_kill = _("蒸発してしまった！", (plural ? " evaporate!" : " evaporates!"));
+				note_kill = _("蒸発してしまった！", (plural ? " evaporate!" : " evaporates!"));
 				break;
 			}
 
 			case GF_CHAOS:
 			{
 				do_kill = TRUE;
-                note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!"));
+				note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!"));
 				if (have_flag(flgs, TR_RES_CHAOS)) ignore = TRUE;
 				else if ((o_ptr->tval == TV_SCROLL) && (o_ptr->sval == SV_SCROLL_CHAOS)) ignore = TRUE;
 				break;
@@ -1382,8 +1433,8 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 			{
 				if (object_is_cursed(o_ptr))
 				{
-                    do_kill = TRUE;
-                    note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!"));
+					do_kill = TRUE;
+					note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!"));
 				}
 				break;
 			}
@@ -1413,10 +1464,9 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 						/* Identify */
 						object_known(o_ptr);
 
-						/* Notice */
 						if (known && (o_ptr->marked & OM_FOUND))
 						{
-                            msg_print(_("カチッと音がした！", "Click!"));
+							msg_print(_("カチッと音がした！", "Click!"));
 							obvious = TRUE;
 						}
 					}
@@ -1429,7 +1479,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 				if (o_ptr->tval == TV_CORPSE)
 				{
 					int i;
-					u32b mode = 0L;
+					BIT_FLAGS mode = 0L;
 
 					if (!who || is_pet(&m_list[who]))
 						mode |= PM_FORCE_PET;
@@ -1437,21 +1487,21 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 					for (i = 0; i < o_ptr->number ; i++)
 					{
 						if (((o_ptr->sval == SV_CORPSE) && (randint1(100) > 80)) ||
-						    ((o_ptr->sval == SV_SKELETON) && (randint1(100) > 60)))
+							((o_ptr->sval == SV_SKELETON) && (randint1(100) > 60)))
 						{
 							if (!note_kill)
 							{
-                                note_kill = _("灰になった。", (plural ? " become dust." : " becomes dust."));
+								note_kill = _("灰になった。", (plural ? " become dust." : " becomes dust."));
 							}
 							continue;
 						}
 						else if (summon_named_creature(who, y, x, o_ptr->pval, mode))
 						{
-                            note_kill = _("生き返った。", " revived.");
+							note_kill = _("生き返った。", " revived.");
 						}
 						else if (!note_kill)
 						{
-                            note_kill = _("灰になった。", (plural ? " become dust." : " becomes dust."));
+							note_kill = _("灰になった。", (plural ? " become dust." : " becomes dust."));
 						}
 					}
 					do_kill = TRUE;
@@ -1478,8 +1528,8 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 				/* Observe the resist */
 				if (known && (o_ptr->marked & OM_FOUND))
 				{
-                    msg_format(_("%sは影響を受けない！", 
-                       (plural ? "The %s are unaffected!" : "The %s is unaffected!")), o_name);
+					msg_format(_("%sは影響を受けない！", 
+					   (plural ? "The %s are unaffected!" : "The %s is unaffected!")), o_name);
 				}
 			}
 
@@ -1489,14 +1539,11 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 				/* Describe if needed */
 				if (known && (o_ptr->marked & OM_FOUND) && note_kill)
 				{
-                    msg_format(_("%sは%s", "The %s%s"), o_name, note_kill);
+					msg_format(_("%sは%s", "The %s%s"), o_name, note_kill);
 				}
 
 				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' */
@@ -1505,7 +1552,6 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
 					(void)potion_smash_effect(who, y, x, k_idx);
 				}
 
-				/* Redraw */
 				lite_spot(y, x);
 			}
 		}
@@ -1536,49 +1582,55 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
  * (polymorph and teleport being the obvious ones), a default damage, which
  * is modified as needed based on various properties, and finally a "damage
  * type" (see below).
- *
+ * </pre>
+ * <pre>
  * Note that this routine can handle "no damage" attacks (like teleport) by
  * taking a "zero" damage, and can even take "parameters" to attacks (like
  * confuse) by accepting a "damage", using it to calculate the effect, and
  * then setting the damage to zero.  Note that the "damage" parameter is
  * divided by the radius, so monsters not at the "epicenter" will not take
  * as much damage (or whatever)...
- *
+ * </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.
- *
+ * </pre>
+ * <pre>
  * Just "casting" a substance (i.e. plasma) does not make you immune, you must
  * actually be "made" of that substance, or "breathe" big balls of it.
- *
  * We assume that "Plasma" monsters, and "Plasma" breathers, are immune
  * to plasma.
- *
  * We assume "Nether" is an evil, necromantic force, so it doesn't hurt undead,
  * and hurts evil less.  If can breath nether, then it resists it as well.
- *
+ * </pre>
+ * <pre>
  * Damage reductions use the following formulas:
  *   Note that "dam = dam * 6 / (randint1(6) + 6);"
- *     gives avg damage of .655, ranging from .858 to .500
+ *	 gives avg damage of .655, ranging from .858 to .500
  *   Note that "dam = dam * 5 / (randint1(6) + 6);"
- *     gives avg damage of .544, ranging from .714 to .417
+ *	 gives avg damage of .544, ranging from .714 to .417
  *   Note that "dam = dam * 4 / (randint1(6) + 6);"
- *     gives avg damage of .444, ranging from .556 to .333
+ *	 gives avg damage of .444, ranging from .556 to .333
  *   Note that "dam = dam * 3 / (randint1(6) + 6);"
- *     gives avg damage of .327, ranging from .427 to .250
+ *	 gives avg damage of .327, ranging from .427 to .250
  *   Note that "dam = dam * 2 / (randint1(6) + 6);"
- *     gives something simple.
- *
+ *	 gives something simple.
+ * </pre>
+ * <pre>
  * In this function, "result" messages are postponed until the end, where
  * the "note" string is appended to the monster name, if not NULL.  So,
  * to make a spell have "no effect" just set "note" to NULL.  You should
  * also set "notice" to FALSE, or the player will learn what the spell does.
- *
+ * </pre>
+ * <pre>
  * We attempt to return "TRUE" if the player saw anything "useful" happen.
+ * "flg" was added.
+ * </pre>
  */
-/* "flg" was added. */
-static bool project_m(int who, int r, int y, int x, int dam, int typ, int 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;
 
@@ -1636,7 +1688,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 	char m_name[80];
 	char m_poss[10];
 
-	int photo = 0;
+	PARAMETER_VALUE photo = 0;
 
 	/* Assume no note */
 	cptr note = NULL;
@@ -1671,7 +1723,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 	/* 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)
@@ -1683,7 +1735,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -1698,14 +1750,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_IM_ACID)
 			{
-                note = _("にはかなり耐性がある！", " resists a lot.");
+				note = _("にはかなり耐性がある！", " resists a lot.");
 				dam /= 9;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ACID);
 			}
@@ -1719,15 +1771,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_IM_ELEC)
 			{
-                note = _("にはかなり耐性がある！", " resists a lot.");
-                dam /= 9;
+				note = _("にはかなり耐性がある！", " resists a lot.");
+				dam /= 9;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ELEC);
 			}
 			break;
@@ -1740,20 +1792,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_IM_FIRE)
 			{
-                note = _("にはかなり耐性がある！", " resists a lot.");
+				note = _("にはかなり耐性がある！", " resists a lot.");
 				dam /= 9;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_FIRE);
 			}
 			else if (r_ptr->flags3 & (RF3_HURT_FIRE))
 			{
-                note = _("はひどい痛手をうけた。", " is hit hard.");
+				note = _("はひどい痛手をうけた。", " is hit hard.");
 				dam *= 2;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_FIRE);
 			}
@@ -1767,20 +1819,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_IM_COLD)
 			{
-                note = _("にはかなり耐性がある！", " resists a lot.");
+				note = _("にはかなり耐性がある！", " resists a lot.");
 				dam /= 9;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD);
 			}
 			else if (r_ptr->flags3 & (RF3_HURT_COLD))
-            {
-                note = _("はひどい痛手をうけた。", " is hit hard.");
+			{
+				note = _("はひどい痛手をうけた。", " is hit hard.");
 				dam *= 2;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD);
 			}
@@ -1794,14 +1846,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_IM_POIS)
 			{
-                note = _("にはかなり耐性がある！", " resists a lot.");
+				note = _("にはかなり耐性がある！", " resists a lot.");
 				dam /= 9;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS);
 			}
@@ -1815,14 +1867,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_IM_POIS)
 			{
-                note = _("には耐性がある。", " resists.");
+				note = _("には耐性がある。", " resists.");
 				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS);
 			}
@@ -1836,15 +1888,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flags3 & RF3_GOOD)
-            {
-                note = _("はひどい痛手をうけた。", " is hit hard.");
+			{
+				note = _("はひどい痛手をうけた。", " is hit hard.");
 				dam *= 2;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD);
 			}
@@ -1857,27 +1909,27 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flags3 & RF3_GOOD)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_GOOD;
 			}
 			else if (r_ptr->flags3 & RF3_EVIL)
 			{
-                dam *= 2;
-                note = _("はひどい痛手をうけた。", " is hit hard.");
+				dam *= 2;
+				note = _("はひどい痛手をうけた。", " is hit hard.");
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL;
 			}
 			else
-            {
-                note = _("には耐性がある。", " resists.");
+			{
+				note = _("には耐性がある。", " resists.");
 				dam *= 3; dam /= randint1(6) + 6;
 			}
 			break;
@@ -1889,8 +1941,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -1905,14 +1957,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_PLAS)
-            {
-                note = _("には耐性がある。", " resists.");
+			{
+				note = _("には耐性がある。", " resists.");
 				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_PLAS);
 			}
@@ -1926,7 +1978,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -1934,21 +1986,21 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (r_ptr->flagsr & RFR_RES_NETH)
 			{
 				if (r_ptr->flags3 & RF3_UNDEAD)
-                {
-                    note = _("には完全な耐性がある！", " is immune.");
+				{
+					note = _("には完全な耐性がある！", " is immune.");
 					dam = 0;
 					if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD);
 				}
 				else
 				{
-                    note = _("には耐性がある。", " resists.");
+					note = _("には耐性がある。", " resists.");
 					dam *= 3; dam /= randint1(6) + 6;
 				}
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NETH);
 			}
 			else if (r_ptr->flags3 & RF3_EVIL)
-            {
-                note = _("はいくらか耐性を示した。", " resists somewhat.");
+			{
+				note = _("はいくらか耐性を示した。", " resists somewhat.");
 				dam /= 2;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL);
 			}
@@ -1962,7 +2014,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -1970,13 +2022,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (r_ptr->flagsr & RFR_RES_WATE)
 			{
 				if ((m_ptr->r_idx == MON_WATER_ELEM) || (m_ptr->r_idx == MON_UNMAKER))
-                {
-                    note = _("には完全な耐性がある！", " is immune.");
+				{
+					note = _("には完全な耐性がある！", " is immune.");
 					dam = 0;
 				}
 				else
-                {
-                    note = _("には耐性がある。", " resists.");
+				{
+					note = _("には耐性がある。", " resists.");
 					dam *= 3; dam /= randint1(6) + 6;
 				}
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WATE);
@@ -1990,21 +2042,21 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_CHAO)
-            {
-                note = _("には耐性がある。", " resists.");
+			{
+				note = _("には耐性がある。", " resists.");
 				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_CHAO);
 			}
 			else if ((r_ptr->flags3 & RF3_DEMON) && one_in_(3))
-            {
-                note = _("はいくらか耐性を示した。", " resists somewhat.");
+			{
+				note = _("はいくらか耐性を示した。", " resists somewhat.");
 				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON);
 			}
@@ -2022,16 +2074,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_SHAR)
 			{
-                note = _("には耐性がある。", " resists.");
-                dam *= 3; dam /= randint1(6) + 6;
+				note = _("には耐性がある。", " resists.");
+				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR);
 			}
 			break;
@@ -2044,14 +2096,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_SHAR)
-            {
-                note = _("はいくらか耐性を示した。", " resists somewhat.");
+			{
+				note = _("はいくらか耐性を示した。", " resists somewhat.");
 				dam /= 2;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR);
 			}
@@ -2066,15 +2118,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_SOUN)
 			{
-                note = _("には耐性がある。", " resists.");
-                dam *= 2; dam /= randint1(6) + 6;
+				note = _("には耐性がある。", " resists.");
+				dam *= 2; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SOUN);
 			}
 			else do_stun = (10 + randint1(15) + r) / (r + 1);
@@ -2088,15 +2140,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flags3 & RF3_NO_CONF)
 			{
-                note = _("には耐性がある。", " resists.");
-                dam *= 3; dam /= randint1(6) + 6;
+				note = _("には耐性がある。", " resists.");
+				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
 			}
 			else do_conf = (10 + randint1(15) + r) / (r + 1);
@@ -2110,15 +2162,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_DISE)
 			{
-                note = _("には耐性がある。", " resists.");
-                dam *= 3; dam /= randint1(6) + 6;
+				note = _("には耐性がある。", " resists.");
+				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DISE);
 			}
 			break;
@@ -2130,15 +2182,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_NEXU)
-            {
-                note = _("には耐性がある。", " resists.");
+			{
+				note = _("には耐性がある。", " resists.");
 				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NEXU);
 			}
@@ -2151,15 +2203,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_WALL)
-            {
-                note = _("には耐性がある。", " resists.");
+			{
+				note = _("には耐性がある。", " resists.");
 				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WALL);
 			}
@@ -2168,20 +2220,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		}
 
 		/* Inertia -- breathers resist */
-		case GF_INERTIA:
+		case GF_INERTIAL:
 		{
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_INER)
-            {
-                note = _("には耐性がある。", " resists.");
+			{
+				note = _("には耐性がある。", " resists.");
 				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_INER);
 			}
@@ -2189,7 +2241,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			{
 				/* Powerful monsters can resist */
 				if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-				    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+					(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
 				{
 					obvious = FALSE;
 				}
@@ -2198,7 +2250,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				{
 					if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
 					{
-                        note = _("の動きが遅くなった。", " starts moving slower.");
+						note = _("の動きが遅くなった。", " starts moving slower.");
 					}
 				}
 			}
@@ -2212,14 +2264,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_TIME)
 			{
-                note = _("には耐性がある。", " resists.");
+				note = _("には耐性がある。", " resists.");
 				dam *= 3; dam /= randint1(6) + 6;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_TIME);
 			}
@@ -2235,8 +2287,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -2246,13 +2298,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				if (r_ptr->flags1 & (RF1_UNIQUE))
 				{
 					if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                    note = _("には効果がなかった。", " is unaffected!");
+					note = _("には効果がなかった。", " is unaffected!");
 					resist_tele = TRUE;
 				}
 				else if (r_ptr->level > randint1(100))
 				{
 					if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                    note = _("には耐性がある！", " resists!");
+					note = _("には耐性がある！", " resists!");
 					resist_tele = TRUE;
 				}
 			}
@@ -2262,8 +2314,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) do_dist = 0;
 
 			if (r_ptr->flagsr & RFR_RES_GRAV)
-            {
-                note = _("には耐性がある！", " resists!");
+			{
+				note = _("には耐性がある！", " resists!");
 				dam *= 3; dam /= randint1(6) + 6;
 				do_dist = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_GRAV);
@@ -2273,7 +2325,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				/* 1. slowness */
 				/* Powerful monsters can resist */
 				if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-				    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+					(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
 				{
 					obvious = FALSE;
 				}
@@ -2282,7 +2334,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				{
 					if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
 					{
-                        note = _("の動きが遅くなった。", " starts moving slower.");
+						note = _("の動きが遅くなった。", " starts moving slower.");
 					}
 				}
 
@@ -2291,12 +2343,12 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 				/* Attempt a saving throw */
 				if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-				    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+					(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
 				{
 					/* Resist */
 					do_stun = 0;
 					/* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected!");
+					note = _("には効果がなかった。", " is unaffected!");
 					obvious = FALSE;
 				}
 			}
@@ -2312,7 +2364,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -2328,7 +2380,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -2336,8 +2388,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (r_ptr->flags3 & RF3_HURT_ROCK)
 			{
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK);
-                note = _("の皮膚がただれた！", " loses some skin!");
-                note_dies = _("は蒸発した！", " evaporates!");
+				note = _("の皮膚がただれた！", " loses some skin!");
+				note_dies = _("は蒸発した！", " evaporates!");
 				dam *= 2;
 			}
 			break;
@@ -2348,17 +2400,17 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			/* PSI only works if the monster can see you! -- RG */
-			if (!(los(m_ptr->fy, m_ptr->fx, py, px)))
+			if (!(los(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x)))
 			{
 				if (seen_msg) 
-                    msg_format(_("%sはあなたが見えないので影響されない！", "%^s can't see you, and isn't affected!"), m_name);
+					msg_format(_("%sはあなたが見えないので影響されない！", "%^s can't see you, and isn't affected!"), m_name);
 				skipped = TRUE;
 				break;
 			}
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -2366,15 +2418,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (r_ptr->flags2 & RF2_EMPTY_MIND)
 			{
 				dam = 0;
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
 
 			}
 			else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) ||
-			         (r_ptr->flags3 & RF3_ANIMAL) ||
-			         (r_ptr->level > randint1(3 * dam)))
-            {
-                note = _("には耐性がある！", " resists!");
+					 (r_ptr->flags3 & RF3_ANIMAL) ||
+					 (r_ptr->level > randint1(3 * dam)))
+			{
+				note = _("には耐性がある！", " resists!");
 				dam /= 3;
 
 				/*
@@ -2382,18 +2434,18 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				 * attacks back on them
 				 */
 				if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) &&
-				    (r_ptr->level > p_ptr->lev / 2) &&
-				    one_in_(2))
+					(r_ptr->level > p_ptr->lev / 2) &&
+					one_in_(2))
 				{
 					note = NULL;
 					msg_format(_("%^sの堕落した精神は攻撃を跳ね返した！", 
-                        (seen ? "%^s's corrupted mind backlashes your attack!" : 
-                                "%^ss corrupted mind backlashes your attack!")), m_name);
+						(seen ? "%^s's corrupted mind backlashes your attack!" : 
+								"%^ss corrupted mind backlashes your attack!")), m_name);
 
 					/* Saving throw */
 					if ((randint0(100 + r_ptr->level / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
 					{
-                        msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
+						msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
 					}
 					else
 					{
@@ -2413,7 +2465,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 								case 3:
 								{
 									if (r_ptr->flags3 & RF3_NO_FEAR)
-                                        note = _("には効果がなかった。", " is unaffected.");
+										note = _("には効果がなかった。", " is unaffected.");
 									else
 										set_afraid(p_ptr->afraid + 3 + randint1(dam));
 									break;
@@ -2443,13 +2495,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 						do_fear = 3 + randint1(dam);
 						break;
 					default:
-                        note = _("は眠り込んでしまった！", " falls asleep!");
+						note = _("は眠り込んでしまった！", " falls asleep!");
 						do_sleep = 3 + randint1(dam);
 						break;
 				}
 			}
 
-            note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+			note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
 			break;
 		}
 
@@ -2458,22 +2510,22 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flags2 & RF2_EMPTY_MIND)
 			{
-                dam = 0;
-                note = _("には完全な耐性がある！", " is immune.");
+				dam = 0;
+				note = _("には完全な耐性がある！", " is immune.");
 			}
 			else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) ||
-			         (r_ptr->flags3 & RF3_ANIMAL) ||
-			         (r_ptr->level > randint1(3 * dam)))
-            {
-                note = _("には耐性がある！", " resists!");
+					 (r_ptr->flags3 & RF3_ANIMAL) ||
+					 (r_ptr->level > randint1(3 * dam)))
+			{
+				note = _("には耐性がある！", " resists!");
 				dam /= 3;
 
 				/*
@@ -2481,17 +2533,17 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				 * attacks back on them
 				 */
 				if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) &&
-				     (r_ptr->level > p_ptr->lev / 2) &&
-				     (one_in_(2)))
+					 (r_ptr->level > p_ptr->lev / 2) &&
+					 (one_in_(2)))
 				{
 					note = NULL;
 					msg_format(_("%^sの堕落した精神は攻撃を跳ね返した！", 
-                        (seen ? "%^s's corrupted mind backlashes your attack!" : 
-                                "%^ss corrupted mind backlashes your attack!")), m_name);
+						(seen ? "%^s's corrupted mind backlashes your attack!" : 
+								"%^ss corrupted mind backlashes your attack!")), m_name);
 					/* Saving throw */
 					if ((randint0(100 + r_ptr->level / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
 					{
-                        msg_print(_("あなたは効力を跳ね返した！", "You resist the effects!"));
+						msg_print(_("あなたは効力を跳ね返した！", "You resist the effects!"));
 					}
 					else
 					{
@@ -2499,7 +2551,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 						monster_desc(killer, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
 						if (!CHECK_MULTISHADOW())
 						{
-                            msg_print(_("超能力パワーを吸いとられた！", "Your psychic energy is drained!"));
+							msg_print(_("超能力パワーを吸いとられた！", "Your psychic energy is drained!"));
 							p_ptr->csp -= damroll(5, dam) / 2;
 							if (p_ptr->csp < 0) p_ptr->csp = 0;
 							p_ptr->redraw |= PR_MANA;
@@ -2513,10 +2565,10 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			else if (dam > 0)
 			{
 				int b = damroll(5, dam) / 4;
-                cptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana");
-                cptr msg = _("あなたは%sの苦痛を%sに変換した！", 
-                     (seen ? "You convert %s's pain into %s!" : 
-                             "You convert %ss pain into %s!"));
+				cptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana");
+				cptr msg = _("あなたは%sの苦痛を%sに変換した！", 
+					 (seen ? "You convert %s's pain into %s!" : 
+							 "You convert %ss pain into %s!"));
 				msg_format(msg, m_name, str);
 
 				b = MIN(p_ptr->msp, p_ptr->csp + b);
@@ -2524,7 +2576,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				p_ptr->redraw |= PR_MANA;
 				p_ptr->window |= (PW_SPELL);
 			}
-            note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+			note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
 			break;
 		}
 
@@ -2533,8 +2585,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -2550,7 +2602,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Attempt a saving throw */
 			if ((r_ptr->flags1 & RF1_UNIQUE) ||
-			    (r_ptr->level > 5 + randint1(dam)))
+				(r_ptr->level > 5 + randint1(dam)))
 			{
 				/* Resist */
 				do_stun = 0;
@@ -2567,7 +2619,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -2581,8 +2633,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -2598,15 +2650,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には効果がなかった！", " is immune.");
+				note = _("には効果がなかった！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			/* Attempt a saving throw */
 			if ((r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) ||
-			    (r_ptr->flags3 & RF3_NO_CONF) ||
-			    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+				(r_ptr->flags3 & RF3_NO_CONF) ||
+				(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
 			{
 				/* Memorize a flag */
 				if (r_ptr->flags3 & RF3_NO_CONF)
@@ -2622,18 +2674,18 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				 * attacks back on them
 				 */
 				if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) &&
-				    (r_ptr->level > p_ptr->lev / 2) &&
-				    (one_in_(2)))
+					(r_ptr->level > p_ptr->lev / 2) &&
+					(one_in_(2)))
 				{
-                    note = NULL;
-                    msg_format(_("%^sの堕落した精神は攻撃を跳ね返した！",
-                        (seen ? "%^s's corrupted mind backlashes your attack!" :
-                        "%^ss corrupted mind backlashes your attack!")), m_name);
+					note = NULL;
+					msg_format(_("%^sの堕落した精神は攻撃を跳ね返した！",
+						(seen ? "%^s's corrupted mind backlashes your attack!" :
+						"%^ss corrupted mind backlashes your attack!")), m_name);
 
 					/* Saving throw */
 					if (randint0(100 + r_ptr->level/2) < p_ptr->skill_sav)
 					{
-                        msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
+						msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
 					}
 					else
 					{
@@ -2649,7 +2701,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 							default:
 							{
 								if (r_ptr->flags3 & RF3_NO_FEAR)
-                                    note = _("には効果がなかった。", " is unaffected.");
+									note = _("には効果がなかった。", " is unaffected.");
 								else
 									set_afraid(p_ptr->afraid + dam);
 							}
@@ -2659,15 +2711,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				else
 				{
 					/* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected.");
+					note = _("には効果がなかった。", " is unaffected.");
 					obvious = FALSE;
 				}
 			}
 			else
 			{
-				if ((dam > 29) && (randint1(100) < dam))
+				if (!common_saving_throw_charm(p_ptr, dam, m_ptr))
 				{
-                    note = _("があなたに隷属した。", " is in your thrall!");
+					note = _("があなたに隷属した。", " is in your thrall!");
 					set_pet(m_ptr);
 				}
 				else
@@ -2699,22 +2751,22 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			do_stun = (randint1(15) + 1) / (r + 1);
 			if (r_ptr->flagsr & RFR_IM_COLD)
-            {
-                note = _("にはかなり耐性がある！", " resists a lot.");
+			{
+				note = _("にはかなり耐性がある！", " resists a lot.");
 				dam /= 9;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD);
 			}
 			else if (r_ptr->flags3 & (RF3_HURT_COLD))
 			{
-                note = _("はひどい痛手をうけた。", " is hit hard.");
+				note = _("はひどい痛手をうけた。", " is hit hard.");
 				dam *= 2;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD);
 			}
@@ -2723,13 +2775,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 
 		/* Drain Life */
-		case GF_OLD_DRAIN:
+		case GF_HYPODYNAMIA:
 		{
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -2742,7 +2794,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 					if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD);
 					if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING);
 				}
-                note = _("には効果がなかった。", " is unaffected.");
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 				dam = 0;
 			}
@@ -2757,8 +2809,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -2771,7 +2823,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 					if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD);
 					if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING);
 				}
-                note = _("には完全な耐性がある！", " is immune.");
+				note = _("には完全な耐性がある！", " is immune.");
 				obvious = FALSE;
 				dam = 0;
 			}
@@ -2779,8 +2831,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				 (randint1(888) != 666)) ||
 				 (((r_ptr->level + randint1(20)) > randint1((caster_lev / 2) + randint1(10))) &&
 				 randint1(100) != 66))
-            {
-                note = _("には耐性がある！", " resists!");
+			{
+				note = _("には耐性がある！", " resists!");
 				obvious = FALSE;
 				dam = 0;
 			}
@@ -2794,8 +2846,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -2805,10 +2857,10 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Powerful monsters can resist */
 			if ((r_ptr->flags1 & RF1_UNIQUE) ||
-			    (r_ptr->flags1 & RF1_QUESTOR) ||
-			    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+				(r_ptr->flags1 & RF1_QUESTOR) ||
+				(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				do_poly = FALSE;
 				obvious = FALSE;
 			}
@@ -2826,8 +2878,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if ((p_ptr->inside_arena) || is_pet(m_ptr) || (r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & (RF7_NAZGUL | RF7_UNIQUE2)))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 			}
 			else
 			{
@@ -2837,7 +2889,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				/* Attempt to clone. */
 				if (multiply_monster(c_ptr->m_idx, TRUE, 0L))
 				{
-                    note = _("が分裂した！", " spawns!");
+					note = _("が分裂した！", " spawns!");
 				}
 			}
 
@@ -2858,7 +2910,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (m_ptr->maxhp < m_ptr->max_maxhp)
 			{
-                if (seen_msg) msg_format(_("%^sの強さが戻った。", "%^s recovers %s vitality."), m_name, m_poss);
+				if (seen_msg) msg_format(_("%^sの強さが戻った。", "%^s recovers %s vitality."), m_name, m_poss);
 				m_ptr->maxhp = m_ptr->max_maxhp;
 			}
 
@@ -2880,17 +2932,17 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			(void)set_monster_csleep(c_ptr->m_idx, 0);
 			if (MON_STUNNED(m_ptr))
 			{
-                if (seen_msg) msg_format(_("%^sは朦朧状態から立ち直った。", "%^s is no longer stunned."), m_name);
+				if (seen_msg) msg_format(_("%^sは朦朧状態から立ち直った。", "%^s is no longer stunned."), m_name);
 				(void)set_monster_stunned(c_ptr->m_idx, 0);
 			}
 			if (MON_CONFUSED(m_ptr))
 			{
-                if (seen_msg) msg_format(_("%^sは混乱から立ち直った。", "%^s is no longer confused."), m_name);
+				if (seen_msg) msg_format(_("%^sは混乱から立ち直った。", "%^s is no longer confused."), m_name);
 				(void)set_monster_confused(c_ptr->m_idx, 0);
 			}
 			if (MON_MONFEAR(m_ptr))
 			{
-                if (seen_msg) msg_format(_("%^sは勇気を取り戻した。", "%^s recovers %s courage."), m_name);
+				if (seen_msg) msg_format(_("%^sは勇気を取り戻した。", "%^s recovers %s courage."), m_name);
 				(void)set_monster_monfear(c_ptr->m_idx, 0);
 			}
 
@@ -2931,8 +2983,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			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.");
+			note = _("は体力を回復したようだ。", " looks healthier.");
 
 			/* No "real" damage */
 			dam = 0;
@@ -2948,7 +2999,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			/* Speed up */
 			if (set_monster_fast(c_ptr->m_idx, MON_FAST(m_ptr) + 100))
 			{
-                note = _("の動きが速くなった。", " starts moving faster.");
+				note = _("の動きが速くなった。", " starts moving faster.");
 			}
 
 			if (!who)
@@ -2971,17 +3022,17 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			/* Powerful monsters can resist */
 			if ((r_ptr->flags1 & RF1_UNIQUE) ||
-			    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+				(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 			}
 
@@ -2990,7 +3041,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			{
 				if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
 				{
-                    note = _("の動きが遅くなった。", " starts moving slower.");
+					note = _("の動きが遅くなった。", " starts moving slower.");
 				}
 			}
 
@@ -3006,16 +3057,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			/* Attempt a saving throw */
 			if ((r_ptr->flags1 & RF1_UNIQUE) ||
-			    (r_ptr->flags3 & RF3_NO_SLEEP) ||
-			    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+				(r_ptr->flags3 & RF3_NO_SLEEP) ||
+				(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
 			{
 				/* Memorize a flag */
 				if (r_ptr->flags3 & RF3_NO_SLEEP)
@@ -3023,13 +3074,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 					if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP);
 				}
 				/* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 			}
 			else
 			{
 				/* Go to sleep (much) later */
-                note = _("は眠り込んでしまった！", " falls asleep!");
+				note = _("は眠り込んでしまった！", " falls asleep!");
 				do_sleep = 500;
 			}
 
@@ -3046,23 +3097,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
 			{
-                note = _("には効果がなかった！", " is immune.");
+				note = _("には効果がなかった！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			/* Attempt a saving throw */
 			if ((r_ptr->flags1 & RF1_UNIQUE) ||
-			    !(r_ptr->flags3 & RF3_EVIL) ||
-			    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+				!(r_ptr->flags3 & RF3_EVIL) ||
+				(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 			}
 			else
 			{
 				/* Go to sleep (much) later */
-                note = _("は動けなくなった！", " is suspended!");
+				note = _("は動けなくなった！", " is suspended!");
 				do_sleep = 500;
 			}
 
@@ -3077,23 +3128,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			/* Attempt a saving throw */
 			if ((r_ptr->flags1 & RF1_UNIQUE) ||
-			    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+				(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 			}
 			else
 			{
 				/* Go to sleep (much) later */
-                note = _("は動けなくなった！", " is suspended!");
+				note = _("は動けなくなった！", " is suspended!");
 				do_sleep = 500;
 			}
 
@@ -3106,7 +3157,6 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		case GF_CHARM:
 		{
 			int vir;
-			dam += (adj_con_fix[p_ptr->stat_ind[A_CHR]] - 1);
 			vir = virtue_number(V_HARMONY);
 			if (vir)
 			{
@@ -3121,44 +3171,25 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (seen) obvious = TRUE;
 
-			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_NO_CONF) ||
-			    (m_ptr->mflag2 & MFLAG2_NOPET) ||
-			    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 5))
+			if (common_saving_throw_charm(p_ptr, dam, m_ptr))
 			{
-				/* 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.");
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 
 				if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
 			}
 			else if (p_ptr->cursed & TRC_AGGRAVATE)
 			{
-                note = _("はあなたに敵意を抱いている！", " hates you too much!");
+				note = _("はあなたに敵意を抱いている！", " hates you too much!");
 				if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
 			}
 			else
 			{
-                note = _("は突然友好的になったようだ！", " suddenly seems friendly!");
+				note = _("は突然友好的になったようだ！", " suddenly seems friendly!");
 				set_pet(m_ptr);
 
 				chg_virtue(V_INDIVIDUALISM, -1);
@@ -3189,36 +3220,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				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.");
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 				if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
 			}
 			else if (p_ptr->cursed & TRC_AGGRAVATE)
 			{
-                note = _("はあなたに敵意を抱いている！", " hates you too much!");
+				note = _("はあなたに敵意を抱いている！", " hates you too much!");
 				if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
 			}
 			else
 			{
-                note = _("は既にあなたの奴隷だ！", " is in your thrall!");
+				note = _("は既にあなたの奴隷だ！", " is in your thrall!");
 				set_pet(m_ptr);
 			}
 
@@ -3245,37 +3263,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				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.");
-
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 				if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
 			}
 			else if (p_ptr->cursed & TRC_AGGRAVATE)
 			{
-                note = _("はあなたに敵意を抱いている！", " hates you too much!");
+				note = _("はあなたに敵意を抱いている！", " hates you too much!");
 				if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
 			}
 			else
 			{
-                note = _("は既にあなたの奴隷だ！", " is in your thrall!");
+				note = _("は既にあなたの奴隷だ！", " is in your thrall!");
 				set_pet(m_ptr);
 			}
 
@@ -3288,7 +3292,6 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		case GF_CONTROL_ANIMAL:
 		{
 			int vir;
-
 			if (seen) obvious = TRUE;
 
 			vir = virtue_number(V_NATURE);
@@ -3303,47 +3306,25 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				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.");
-
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 				if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
 			}
 			else if (p_ptr->cursed & TRC_AGGRAVATE)
 			{
-                note = _("はあなたに敵意を抱いている！", " hates you too much!");
+				note = _("はあなたに敵意を抱いている！", " hates you too much!");
 				if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
 			}
 			else
 			{
-                note = _("はなついた。", " is tamed!");
+				note = _("はなついた。", " is tamed!");
 				set_pet(m_ptr);
-
 				if (r_ptr->flags3 & RF3_ANIMAL)
 					chg_virtue(V_NATURE, 1);
 			}
@@ -3354,14 +3335,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		}
 
 		/* Tame animal */
-		case GF_CONTROL_LIVING:
+		case GF_CHARM_LIVING:
 		{
 			int vir;
 
 			vir = virtue_number(V_UNLIFE);
 			if (seen) obvious = TRUE;
 
-			dam += (adj_chr_chm[p_ptr->stat_ind[A_CHR]]);
 			vir = virtue_number(V_UNLIFE);
 			if (vir)
 			{
@@ -3374,43 +3354,27 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				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;
+			msg_format(_("%sを見つめた。", "You stare into %s."), m_name);
 
 			/* 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(r_ptr))
 			{
 				/* Resist */
 				/* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
-
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 				if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
 			}
 			else if (p_ptr->cursed & TRC_AGGRAVATE)
 			{
-                note = _("はあなたに敵意を抱いている！", " hates you too much!");
+				note = _("はあなたに敵意を抱いている！", " hates you too much!");
 				if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
 			}
 			else
 			{
-                note = _("を支配した。", " is tamed!");
+				note = _("を支配した。", " is tamed!");
 				set_pet(m_ptr);
-
 				if (r_ptr->flags3 & RF3_ANIMAL)
 					chg_virtue(V_NATURE, 1);
 			}
@@ -3426,8 +3390,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -3437,8 +3401,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Attempt a saving throw */
 			if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-			    (r_ptr->flags3 & (RF3_NO_CONF)) ||
-			    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+				(r_ptr->flags3 & (RF3_NO_CONF)) ||
+				(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
 			{
 				/* Memorize a flag */
 				if (r_ptr->flags3 & (RF3_NO_CONF))
@@ -3450,7 +3414,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				do_conf = 0;
 
 				/* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 			}
 
@@ -3464,8 +3428,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -3474,13 +3438,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Attempt a saving throw */
 			if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-			    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+				(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
 			{
 				/* Resist */
 				do_stun = 0;
 
 				/* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 			}
 
@@ -3515,8 +3479,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE);
 
 				/* Special effect */
-                note = _("は光に身をすくめた！", " cringes from the light!");
-                note_dies = _("は光を受けてしぼんでしまった！", " shrivels away in the light!");
+				note = _("は光に身をすくめた！", " cringes from the light!");
+				note_dies = _("は光を受けてしぼんでしまった！", " shrivels away in the light!");
 			}
 
 			/* Normally no damage */
@@ -3537,23 +3501,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_LITE)
-            {
-                note = _("には耐性がある！", " resists!");
+			{
+				note = _("には耐性がある！", " resists!");
 				dam *= 2; dam /= (randint1(6)+6);
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_LITE);
 			}
 			else if (r_ptr->flags3 & (RF3_HURT_LITE))
 			{
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE);
-                note = _("は光に身をすくめた！", " cringes from the light!");
-                note_dies = _("は光を受けてしぼんでしまった！", " shrivels away in the light!");
+				note = _("は光に身をすくめた！", " cringes from the light!");
+				note_dies = _("は光を受けてしぼんでしまった！", " shrivels away in the light!");
 				dam *= 2;
 			}
 			break;
@@ -3566,15 +3530,15 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flagsr & RFR_RES_DARK)
-            {
-                note = _("には耐性がある！", " resists!");
+			{
+				note = _("には耐性がある！", " resists!");
 				dam *= 2; dam /= (randint1(6)+6);
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DARK);
 			}
@@ -3600,8 +3564,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK);
 
 				/* Cute little message */
-                note = _("の皮膚がただれた！", " loses some skin!");
-                note_dies = _("はドロドロに溶けた！", " dissolves!");
+				note = _("の皮膚がただれた！", " loses some skin!");
+				note_dies = _("はドロドロに溶けた！", " dissolves!");
 			}
 
 			/* Usually, ignore the effects */
@@ -3627,14 +3591,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				{
 					if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
 					{
-                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                        note = _("には効果がなかった。", " is unaffected.");
+						if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+						note = _("には効果がなかった。", " is unaffected.");
 						resists_tele = TRUE;
 					}
 					else if (r_ptr->level > randint1(100))
 					{
-                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                        note = _("には耐性がある！", " resists!");
+						if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+						note = _("には耐性がある！", " resists!");
 						resists_tele = TRUE;
 					}
 				}
@@ -3672,14 +3636,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				{
 					if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
 					{
-                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                        note = _("には効果がなかった。", " is unaffected.");
+						if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+						note = _("には効果がなかった。", " is unaffected.");
 						resists_tele = TRUE;
 					}
 					else if (r_ptr->level > randint1(100))
 					{
-                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                        note = _("には耐性がある！", " resists!");
+						if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+						note = _("には耐性がある！", " resists!");
 						resists_tele = TRUE;
 					}
 				}
@@ -3713,21 +3677,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			{
 				if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
 				{
-                    if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                    note = _("には効果がなかった。", " is unaffected.");
+					if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+					note = _("には効果がなかった。", " is unaffected.");
 					resists_tele = TRUE;
 				}
 				else if (r_ptr->level > randint1(100))
 				{
-                    if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
-                    note = _("には耐性がある！", " resists!");
+					if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
+					note = _("には耐性がある！", " resists!");
 					resists_tele = TRUE;
 				}
 			}
 
 			if (!resists_tele)
 			{
-				/* Obvious */
 				if (seen) obvious = TRUE;
 
 				/* Prepare to teleport */
@@ -3751,7 +3714,6 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			/* Only affect undead */
 			if (r_ptr->flags3 & (RF3_UNDEAD))
 			{
-				/* Obvious */
 				if (seen) obvious = TRUE;
 
 				/* Learn about type */
@@ -3764,7 +3726,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				if (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)
 				{
 					/* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected.");
+					note = _("には効果がなかった。", " is unaffected.");
 					obvious = FALSE;
 					do_fear = 0;
 				}
@@ -3794,7 +3756,6 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			/* Only affect evil */
 			if (r_ptr->flags3 & (RF3_EVIL))
 			{
-				/* Obvious */
 				if (seen) obvious = TRUE;
 
 				/* Learn about type */
@@ -3807,7 +3768,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				if (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)
 				{
 					/* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected.");
+					note = _("には効果がなかった。", " is unaffected.");
 					obvious = FALSE;
 					do_fear = 0;
 				}
@@ -3834,7 +3795,6 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				skipped = TRUE;
 				break;
 			}
-			/* Obvious */
 			if (seen) obvious = TRUE;
 
 			/* Apply some fear */
@@ -3842,11 +3802,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Attempt a saving throw */
 			if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-			    (r_ptr->flags3 & (RF3_NO_FEAR)) ||
-			    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+				(r_ptr->flags3 & (RF3_NO_FEAR)) ||
+				(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
 			{
 				/* No obvious effect */
-                note = _("には効果がなかった。", " is unaffected.");
+				note = _("には効果がなかった。", " is unaffected.");
 				obvious = FALSE;
 				do_fear = 0;
 			}
@@ -3869,15 +3829,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			/* 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!");
+				note = _("は身震いした。", " shudders.");
+				note_dies = _("はドロドロに溶けた！", " dissolves!");
 			}
 
 			/* Others ignore */
@@ -3906,15 +3864,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			/* 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!");
+				note = _("は身震いした。", " shudders.");
+				note_dies = _("はドロドロに溶けた！", " dissolves!");
 			}
 
 			/* Others ignore */
@@ -3942,15 +3898,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			/* 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!");
+				note = _("は身震いした。", " shudders.");
+				note_dies = _("はドロドロに溶けた！", " dissolves!");
 			}
 
 			/* Others ignore */
@@ -3978,12 +3932,10 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			/* Only affect non-undead */
 			if (monster_living(r_ptr))
 			{
-				/* Obvious */
 				if (seen) obvious = TRUE;
 
-				/* Message */
-                note = _("は身震いした。", " shudders.");
-                note_dies = _("はドロドロに溶けた！", " dissolves!");
+				note = _("は身震いした。", " shudders.");
+				note_dies = _("はドロドロに溶けた！", " dissolves!");
 			}
 
 			/* Others ignore */
@@ -4011,15 +3963,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			/* 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!");
+				note = _("は身震いした。", " shudders.");
+				note_dies = _("はドロドロに溶けた！", " dissolves!");
 			}
 
 			/* Others ignore */
@@ -4044,12 +3994,10 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				dam = 0;
 				break;
 			}
-			/* Obvious */
 			if (seen) obvious = TRUE;
 
-			/* Message */
-            note = _("は身震いした。", " shudders.");
-            note_dies = _("はドロドロに溶けた！", " dissolves!");
+			note = _("は身震いした。", " shudders.");
+			note_dies = _("はドロドロに溶けた！", " dissolves!");
 			break;
 		}
 
@@ -4059,14 +4007,14 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 
-			if ((r_ptr->flags4 & ~(RF4_NOMAGIC_MASK)) || (r_ptr->flags5 & ~(RF5_NOMAGIC_MASK)) || (r_ptr->flags6 & ~(RF6_NOMAGIC_MASK)))
+			if ((r_ptr->flags4 & ~(RF4_NOMAGIC_MASK)) || (r_ptr->a_ability_flags1 & ~(RF5_NOMAGIC_MASK)) || (r_ptr->a_ability_flags2 & ~(RF6_NOMAGIC_MASK)))
 			{
 				if (who > 0)
 				{
@@ -4086,20 +4034,19 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 						{
 							/* Get the monster name */
 							monster_desc(killer, caster_ptr, 0);
-                            msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), killer);
+							msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), killer);
 						}
 					}
 				}
 				else
 				{
-					/* Message */
-                    msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), m_name);
+					msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), m_name);
 					(void)hp_player(dam);
 				}
 			}
 			else
 			{
-                if (see_s_msg) msg_format(_("%sには効果がなかった。", "%s is unaffected."), m_name);
+				if (see_s_msg) msg_format(_("%sには効果がなかった。", "%s is unaffected."), m_name);
 			}
 			dam = 0;
 			break;
@@ -4109,12 +4056,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		case GF_MIND_BLAST:
 		{
 			if (seen) obvious = TRUE;
-			/* Message */
-            if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name);
+			if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name);
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -4129,26 +4075,26 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				if (r_ptr->flags3 & (RF3_NO_CONF))
 				{
 					if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
-                }
-                note = _("には効果がなかった。", " is unaffected.");
+				}
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 			}
 			else if (r_ptr->flags2 & RF2_EMPTY_MIND)
 			{
-                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
-                note = _("には完全な耐性がある！", " is immune.");
+				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 			}
 			else if (r_ptr->flags2 & RF2_WEIRD_MIND)
 			{
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
-                note = _("には耐性がある。", " resists.");
+				note = _("には耐性がある。", " resists.");
 				dam /= 3;
 			}
 			else
 			{
-                note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
-                note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+				note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
+				note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
 
 				if (who > 0) do_conf = randint0(4) + 4;
 				else do_conf = randint0(8) + 8;
@@ -4160,12 +4106,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		case GF_BRAIN_SMASH:
 		{
 			if (seen) obvious = TRUE;
-			/* Message */
-            if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name);
+			if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name);
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -4180,26 +4125,26 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				if (r_ptr->flags3 & (RF3_NO_CONF))
 				{
 					if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
-                }
-                note = _("には効果がなかった。", " is unaffected.");
+				}
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 			}
 			else if (r_ptr->flags2 & RF2_EMPTY_MIND)
 			{
-                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
-                note = _("には完全な耐性がある！", " is immune.");
+				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 			}
 			else if (r_ptr->flags2 & RF2_WEIRD_MIND)
 			{
-                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
-                note = _("には耐性がある！", " resists!");
+				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
+				note = _("には耐性がある！", " resists!");
 				dam /= 3;
 			}
 			else
 			{
-                note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
-                note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+				note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
+				note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
 
 				if (who > 0)
 				{
@@ -4220,12 +4165,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		case GF_CAUSE_1:
 		{
 			if (seen) obvious = TRUE;
-			/* Message */
-            if (!who) msg_format(_("%sを指差して呪いをかけた。", "You point at %s and curse."), m_name);
+			if (!who) msg_format(_("%sを指差して呪いをかけた。", "You point at %s and curse."), m_name);
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -4233,8 +4177,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Attempt a saving throw */
 			if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 			}
 			break;
@@ -4244,12 +4188,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		case GF_CAUSE_2:
 		{
 			if (seen) obvious = TRUE;
-			/* Message */
-            if (!who) msg_format(_("%sを指差して恐ろしげに呪いをかけた。", "You point at %s and curse horribly."), m_name);
+			if (!who) msg_format(_("%sを指差して恐ろしげに呪いをかけた。", "You point at %s and curse horribly."), m_name);
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -4257,8 +4200,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Attempt a saving throw */
 			if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 			}
 			break;
@@ -4268,12 +4211,11 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		case GF_CAUSE_3:
 		{
 			if (seen) obvious = TRUE;
-			/* Message */
-            if (!who) msg_format(_("%sを指差し、恐ろしげに呪文を唱えた！", "You point at %s, incanting terribly!"), m_name);
+			if (!who) msg_format(_("%sを指差し、恐ろしげに呪文を唱えた！", "You point at %s, incanting terribly!"), m_name);
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -4281,8 +4223,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Attempt a saving throw */
 			if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 			}
 			break;
@@ -4292,14 +4234,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		case GF_CAUSE_4:
 		{
 			if (seen) obvious = TRUE;
-			/* Message */
 			if (!who) 
-                msg_format(_("%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。", 
-                             "You point at %s, screaming the word, 'DIE!'."), m_name);
+				msg_format(_("%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。", 
+							 "You point at %s, screaming the word, 'DIE!'."), m_name);
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -4307,8 +4248,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Attempt a saving throw */
 			if ((randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35)) && ((who <= 0) || (caster_ptr->r_idx != MON_KENSHIROU)))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 			}
 			break;
@@ -4320,16 +4261,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 
 			if (r_ptr->flags1 & RF1_UNIQUE)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 			}
 			else
@@ -4343,7 +4284,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				}
 				else
 				{
-                    note = _("は耐性を持っている！", "resists!");
+					note = _("は耐性を持っている！", "resists!");
 					dam = 0;
 				}
 			}
@@ -4355,9 +4296,9 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		{
 			int nokori_hp;
 			if ((p_ptr->inside_quest && (quest[p_ptr->inside_quest].type == QUEST_TYPE_KILL_ALL) && !is_pet(m_ptr)) ||
-			    (r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags7 & (RF7_NAZGUL)) || (r_ptr->flags7 & (RF7_UNIQUE2)) || (r_ptr->flags1 & RF1_QUESTOR) || m_ptr->parent_m_idx)
-            {
-                msg_format(_("%sには効果がなかった。", "%s is unaffected."), m_name);
+				(r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags7 & (RF7_NAZGUL)) || (r_ptr->flags7 & (RF7_UNIQUE2)) || (r_ptr->flags1 & RF1_QUESTOR) || m_ptr->parent_m_idx)
+			{
+				msg_format(_("%sには効果がなかった。", "%s is unaffected."), m_name);
 				skipped = TRUE;
 				break;
 			}
@@ -4370,13 +4311,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			if (m_ptr->hp >= nokori_hp)
 			{
-                msg_format(_("もっと弱らせないと。", "You need to weaken %s more."), m_name);
+				msg_format(_("もっと弱らせないと。", "You need to weaken %s more."), m_name);
 				skipped = TRUE;
 			}
 			else if (m_ptr->hp < randint0(nokori_hp))
 			{
 				if (m_ptr->mflag2 & MFLAG2_CHAMELEON) choose_new_monster(c_ptr->m_idx, FALSE, MON_CHAMELEON);
-                msg_format(_("%sを捕えた！", "You capture %^s!"), m_name);
+				msg_format(_("%sを捕えた！", "You capture %^s!"), m_name);
 				cap_mon = m_ptr->r_idx;
 				cap_mspeed = m_ptr->mspeed;
 				cap_hp = m_ptr->hp;
@@ -4386,7 +4327,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				{
 					if (rakuba(-1, FALSE))
 					{
-                        msg_format(_("地面に落とされた。", "You have fallen from %s."), m_name);
+						msg_format(_("地面に落とされた。", "You have fallen from %s."), m_name);
 					}
 				}
 
@@ -4396,7 +4337,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			}
 			else
 			{
-                msg_format(_("うまく捕まえられなかった。", "You failed to capture %s."), m_name);
+				msg_format(_("うまく捕まえられなかった。", "You failed to capture %s."), m_name);
 				skipped = TRUE;
 			}
 			break;
@@ -4418,23 +4359,23 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 			if (r_ptr->flags2 & RF2_EMPTY_MIND)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
 				break;
 			}
 			if (MON_CSLEEP(m_ptr))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 				skipped = TRUE;
 				break;
@@ -4449,9 +4390,9 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			{
 				/* Powerful monsters can resist */
 				if ((r_ptr->flags1 & RF1_UNIQUE) ||
-				    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
-                {
-                    note = _("には効果がなかった。", " is unaffected.");
+					(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+				{
+					note = _("には効果がなかった。", " is unaffected.");
 					obvious = FALSE;
 				}
 
@@ -4460,7 +4401,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				{
 					if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50))
 					{
-                        note = _("の動きが遅くなった。", " starts moving slower.");
+						note = _("の動きが遅くなった。", " starts moving slower.");
 					}
 				}
 			}
@@ -4471,13 +4412,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 				/* Attempt a saving throw */
 				if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
-				    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+					(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
 				{
 					/* Resist */
 					do_stun = 0;
 
 					/* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected.");
+					note = _("には効果がなかった。", " is unaffected.");
 					obvious = FALSE;
 				}
 			}
@@ -4486,8 +4427,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			{
 				/* Attempt a saving throw */
 				if ((r_ptr->flags1 & RF1_UNIQUE) ||
-				    (r_ptr->flags3 & RF3_NO_SLEEP) ||
-				    (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+					(r_ptr->flags3 & RF3_NO_SLEEP) ||
+					(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
 				{
 					/* Memorize a flag */
 					if (r_ptr->flags3 & RF3_NO_SLEEP)
@@ -4496,20 +4437,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 					}
 
 					/* No obvious effect */
-                    note = _("には効果がなかった。", " is unaffected.");
+					note = _("には効果がなかった。", " is unaffected.");
 					obvious = FALSE;
 				}
 				else
 				{
 					/* Go to sleep (much) later */
-                    note = _("は眠り込んでしまった！", " falls asleep!");
+					note = _("は眠り込んでしまった！", " falls asleep!");
 					do_sleep = 500;
 				}
 			}
 
 			if (!done)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 			}
 
 			/* No "real" damage */
@@ -4523,16 +4464,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
 			}
 
-            if (genocide_aux(c_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, _("モンスター消滅", "Genocide One")))
+			if (genocide_aux(c_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, _("モンスター消滅", "Genocide One")))
 			{
-                if (seen_msg) msg_format(_("%sは消滅した！", "%^s disappered!"), m_name);
+				if (seen_msg) msg_format(_("%sは消滅した！", "%^s disappered!"), m_name);
 				chg_virtue(V_VITALITY, -1);
 				return TRUE;
 			}
@@ -4554,8 +4495,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE);
 
 				/* Special effect */
-                note = _("は光に身をすくめた！", " cringes from the light!");
-                note_dies = _("は光を受けてしぼんでしまった！", " shrivels away in the light!");
+				note = _("は光に身をすくめた！", " cringes from the light!");
+				note_dies = _("は光を受けてしぼんでしまった！", " shrivels away in the light!");
 			}
 
 			/* Normally no damage */
@@ -4577,8 +4518,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				dam = 0;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -4599,16 +4540,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				/* No need to tame your pet */
 				if (is_pet(m_ptr))
 				{
-                    note = _("の動きが速くなった。", " starts moving faster.");
+					note = _("の動きが速くなった。", " starts moving faster.");
 					(void)set_monster_fast(c_ptr->m_idx, MON_FAST(m_ptr) + 100);
 					success = TRUE;
 				}
 
 				/* Attempt a saving throw */
 				else if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
-				    (r_ptr->flags1 & (RF1_UNIQUE)) ||
-				    (m_ptr->mflag2 & MFLAG2_NOPET) ||
-				    (p_ptr->cursed & TRC_AGGRAVATE) ||
+					(r_ptr->flags1 & (RF1_UNIQUE)) ||
+					(m_ptr->mflag2 & MFLAG2_NOPET) ||
+					(p_ptr->cursed & TRC_AGGRAVATE) ||
 					 ((r_ptr->level+10) > randint1(dam)))
 				{
 					/* Resist */
@@ -4616,7 +4557,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 				}
 				else
 				{
-                    note = _("を支配した。", " is tamed!");
+					note = _("を支配した。", " is tamed!");
 					set_pet(m_ptr);
 					(void)set_monster_fast(c_ptr->m_idx, MON_FAST(m_ptr) + 100);
 
@@ -4645,8 +4586,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			if (seen) obvious = TRUE;
 
 			if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+			{
+				note = _("には完全な耐性がある！", " is immune.");
 				skipped = TRUE;
 				if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
 				break;
@@ -4654,8 +4595,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Attempt a saving throw */
 			if (randint0(100 + dam) < (r_ptr->level + 50))
-            {
-                note = _("には効果がなかった。", " is unaffected.");
+			{
+				note = _("には効果がなかった。", " is unaffected.");
 				dam = 0;
 			}
 			break;
@@ -4701,7 +4642,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 	/* Modify the damage */
 	tmp = dam;
 	dam = mon_damage_mod(m_ptr, dam, (bool)(typ == GF_PSY_SPEAR));
-    if ((tmp > 0) && (dam == 0)) note = _("はダメージを受けていない。", " is unharmed.");
+	if ((tmp > 0) && (dam == 0)) note = _("はダメージを受けていない。", " is unharmed.");
 
 	/* Check for death */
 	if (dam > m_ptr->hp)
@@ -4713,21 +4654,20 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 	{
 		/* Sound and Impact resisters never stun */
 		if (do_stun &&
-		    !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) &&
-		    !(r_ptr->flags3 & RF3_NO_STUN))
+			!(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) &&
+			!(r_ptr->flags3 & RF3_NO_STUN))
 		{
-			/* Obvious */
 			if (seen) obvious = TRUE;
 
 			/* Get stunned */
 			if (MON_STUNNED(m_ptr))
 			{
-                note = _("はひどくもうろうとした。", " is more dazed.");
-                tmp = MON_STUNNED(m_ptr) + (do_stun / 2);
+				note = _("はひどくもうろうとした。", " is more dazed.");
+				tmp = MON_STUNNED(m_ptr) + (do_stun / 2);
 			}
 			else
 			{
-                note = _("はもうろうとした。", " is dazed.");
+				note = _("はもうろうとした。", " is dazed.");
 				tmp = do_stun;
 			}
 
@@ -4743,20 +4683,19 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			 !(r_ptr->flags3 & RF3_NO_CONF) &&
 			 !(r_ptr->flagsr & RFR_EFF_RES_CHAO_MASK))
 		{
-			/* Obvious */
 			if (seen) obvious = TRUE;
 
 			/* Already partially confused */
 			if (MON_CONFUSED(m_ptr))
 			{
-                note = _("はさらに混乱したようだ。", " looks more confused.");
+				note = _("はさらに混乱したようだ。", " looks more confused.");
 				tmp = MON_CONFUSED(m_ptr) + (do_conf / 2);
 			}
 
 			/* Was not confused */
 			else
 			{
-                note = _("は混乱したようだ。", " looks confused.");
+				note = _("は混乱したようだ。", " looks confused.");
 				tmp = do_conf;
 			}
 
@@ -4769,14 +4708,13 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 		if (do_time)
 		{
-			/* Obvious */
 			if (seen) obvious = TRUE;
 
 			if (do_time >= m_ptr->maxhp) do_time = m_ptr->maxhp - 1;
 
 			if (do_time)
 			{
-                note = _("は弱くなったようだ。", " seems weakened.");
+				note = _("は弱くなったようだ。", " seems weakened.");
 				m_ptr->maxhp -= do_time;
 				if ((m_ptr->hp - dam) > m_ptr->maxhp) dam = m_ptr->hp - m_ptr->maxhp;
 			}
@@ -4788,11 +4726,10 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		{
 			if (polymorph_monster(y, x))
 			{
-				/* Obvious */
 				if (seen) obvious = TRUE;
 
 				/* Monster polymorphs */
-                note = _("が変身した！", " changes!");
+				note = _("が変身した！", " changes!");
 
 				/* Turn off the damage */
 				dam = 0;
@@ -4800,7 +4737,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			else
 			{
 				/* No polymorph */
-                note = _("には効果がなかった。", " is unaffected.");
+				note = _("には効果がなかった。", " is unaffected.");
 			}
 
 			/* Hack -- Get new monster */
@@ -4813,11 +4750,9 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		/* Handle "teleport" */
 		if (do_dist)
 		{
-			/* Obvious */
 			if (seen) obvious = TRUE;
 
-			/* Message */
-            note = _("が消え去った！", " disappears!");
+			note = _("が消え去った！", " disappears!");
 
 			if (!who) chg_virtue(V_VALOUR, -1);
 
@@ -4889,12 +4824,12 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			/* Generate treasure, etc */
 			monster_death(c_ptr->m_idx, FALSE);
 
-			/* Delete the monster */
+
 			delete_monster_idx(c_ptr->m_idx);
 
 			if (sad)
 			{
-                msg_print(_("少し悲しい気分がした。", "You feel sad for a moment."));
+				msg_print(_("少し悲しい気分がした。", "You feel sad for a moment."));
 			}
 		}
 
@@ -4921,7 +4856,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 	else if (heal_leper)
 	{
-        if (seen_msg) msg_print(_("不潔な病人は病気が治った！", "The Mangy looking leper is healed!"));
+		if (seen_msg) msg_print(_("不潔な病人は病気が治った！", "The Mangy looking leper is healed!"));
 
 		if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 		{
@@ -4953,7 +4888,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 
 			/* Give detailed messages if visible or destroyed */
 			if (note && seen_msg)
-                msg_format(_("%s%s", "%^s%s"), m_name, note);
+				msg_format(_("%s%s", "%^s%s"), m_name, note);
 
 			/* Hack -- Pain message */
 			else if (known && (dam || !do_fear))
@@ -4968,11 +4903,9 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			/* Take note */
 			if ((fear || do_fear) && seen)
 			{
-				/* Sound */
 				sound(SOUND_FLEE);
 
-				/* Message */
-                msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name);
+				msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name);
 			}
 
 			/* Hack -- handle sleep */
@@ -4991,30 +4924,30 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			case 1: case 2:
 				if (!count)
 				{
-                    msg_print(_("地面が揺れた...", "The ground trembles..."));
+					msg_print(_("地面が揺れた...", "The ground trembles..."));
 					earthquake(ty, tx, 4 + randint0(4));
 					if (!one_in_(6)) break;
 				}
 			case 3: case 4: case 5: case 6:
 				if (!count)
 				{
-					int dam = damroll(10, 10);
-                    msg_print(_("純粋な魔力の次元への扉が開いた！", "A portal opens to a plane of raw mana!"));
+					int extra_dam = damroll(10, 10);
+					msg_print(_("純粋な魔力の次元への扉が開いた！", "A portal opens to a plane of raw mana!"));
 
-					project(0, 8, ty,tx, dam, GF_MANA, curse_flg, -1);
+					project(0, 8, ty, tx, extra_dam, GF_MANA, curse_flg, -1);
 					if (!one_in_(6)) break;
 				}
 			case 7: case 8:
 				if (!count)
 				{
-                    msg_print(_("空間が歪んだ！", "Space warps about you!"));
+					msg_print(_("空間が歪んだ！", "Space warps about you!"));
 
 					if (m_ptr->r_idx) teleport_away(c_ptr->m_idx, damroll(10, 10), TELEPORT_PASSIVE);
 					if (one_in_(13)) count += activate_hi_summon(ty, tx, TRUE);
 					if (!one_in_(6)) break;
 				}
 			case 9: case 10: case 11:
-                msg_print(_("エネルギーのうねりを感じた！", "You feel a surge of energy!"));
+				msg_print(_("エネルギーのうねりを感じた！", "You feel a surge of energy!"));
 				project(0, 7, ty, tx, 50, GF_DISINTEGRATE, curse_flg, -1);
 				if (!one_in_(6)) break;
 			case 12: case 13: case 14: case 15: case 16:
@@ -5026,17 +4959,17 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 			case 19: case 20: case 21: case 22:
 			{
 				bool pet = !one_in_(3);
-				u32b mode = PM_ALLOW_GROUP;
+				BIT_FLAGS mode = PM_ALLOW_GROUP;
 
 				if (pet) mode |= PM_FORCE_PET;
 				else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
 
-				count += summon_specific((pet ? -1 : 0), py, px, (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);
 				if (!one_in_(6)) break;
 			}
 			case 23: case 24: case 25:
 				if (p_ptr->hold_exp && (randint0(100) < 75)) break;
-                msg_print(_("経験値が体から吸い取られた気がする！", "You feel your experience draining away..."));
+				msg_print(_("経験値が体から吸い取られた気がする！", "You feel your experience draining away..."));
 
 				if (p_ptr->hold_exp) lose_exp(p_ptr->exp / 160);
 				else lose_exp(p_ptr->exp / 16);
@@ -5075,10 +5008,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		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);
@@ -5087,7 +5018,6 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 	/* 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);
 	}
 
@@ -5117,8 +5047,6 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 	{
 		object_type *q_ptr;
 		object_type forge;
-
-		/* Get local object */
 		q_ptr = &forge;
 
 		/* Prepare to make a Blade of Chaos */
@@ -5130,7 +5058,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 		q_ptr->ident |= (IDENT_MENTAL);
 
 		/* Drop it in the dungeon */
-		(void)drop_near(q_ptr, -1, py, px);
+		(void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
 	}
 
 	/* Track it */
@@ -5152,10 +5080,9 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
  * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player)
  * @param typ 効果属性 / Type of damage to apply to monsters (and objects)
  * @param flg 効果フラグ
- * @param mon_spell 効果元のモンスター魔法ID
+ * @param monspell 効果元のモンスター魔法ID
  * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE
  * @details
- * <pre>
  * Handle a beam/bolt/ball causing damage to the player.
  * This routine takes a "source monster" (by index), a "distance", a default
  * "damage", and a "damage type".  See "project_m()" above.
@@ -5166,9 +5093,8 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
  * to know if this is actually a ball or a bolt spell
  * We return "TRUE" if any "obvious" effects were observed.  XXX XXX Actually,
  * we just assume that the effects were obvious, for historical reasons.
- * </pre>
  */
-static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int typ, int 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;
@@ -5211,15 +5137,16 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
 	if ((p_ptr->reflect || ((p_ptr->special_defense & KATA_FUUJIN) && !p_ptr->blind)) && (flg & PROJECT_REFLECTABLE) && !one_in_(10))
 	{
-		byte t_y, t_x;
+		POSITION t_y, t_x;
 		int max_attempts = 10;
+		sound(SOUND_REFLECT);
 
-        if (blind) 
-            msg_print(_("何かが跳ね返った！", "Something bounces!"));
+		if (blind) 
+			msg_print(_("何かが跳ね返った！", "Something bounces!"));
 		else if (p_ptr->special_defense & KATA_FUUJIN) 
-            msg_print(_("風の如く武器を振るって弾き返した！", "The attack bounces!"));
+			msg_print(_("風の如く武器を振るって弾き返した！", "The attack bounces!"));
 		else 
-            msg_print(_("攻撃が跳ね返った！", "The attack bounces!"));
+			msg_print(_("攻撃が跳ね返った！", "The attack bounces!"));
 
 
 		/* Choose 'new' target */
@@ -5231,7 +5158,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 				t_x = m_list[who].fx - 1 + randint1(3);
 				max_attempts--;
 			}
-			while (max_attempts && in_bounds2u(t_y, t_x) && !projectable(py, px, t_y, t_x));
+			while (max_attempts && in_bounds2u(t_y, t_x) && !projectable(p_ptr->y, p_ptr->x, t_y, t_x));
 
 			if (max_attempts < 1)
 			{
@@ -5241,17 +5168,16 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		}
 		else
 		{
-			t_y = py - 1 + randint1(3);
-			t_x = px - 1 + randint1(3);
+			t_y = p_ptr->y - 1 + randint1(3);
+			t_x = p_ptr->x - 1 + randint1(3);
 		}
 
 		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;
 
@@ -5281,15 +5207,15 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		switch (who)
 		{
 		case PROJECT_WHO_UNCTRL_POWER:
-            strcpy(killer, _("制御できない力の氾流", "uncontrollable power storm"));
+			strcpy(killer, _("制御できない力の氾流", "uncontrollable power storm"));
 			break;
 
 		case PROJECT_WHO_GLASS_SHARDS:
-            strcpy(killer, _("ガラスの破片", "shards of glass"));
+			strcpy(killer, _("ガラスの破片", "shards of glass"));
 			break;
 
 		default:
-            strcpy(killer, _("ç½ ", "a trap"));
+			strcpy(killer, _("ç½ ", "a trap"));
 			break;
 		}
 
@@ -5303,7 +5229,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		/* Standard damage -- hurts inventory too */
 		case GF_ACID:
 		{
-            if (fuzzy) msg_print(_("酸で攻撃された！", "You are hit by acid!"));			
+			if (fuzzy) msg_print(_("酸で攻撃された！", "You are hit by acid!"));			
 			get_damage = acid_dam(dam, killer, monspell, FALSE);
 			break;
 		}
@@ -5311,8 +5237,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		/* Standard damage -- hurts inventory too */
 		case GF_FIRE:
 		{
-            if (fuzzy) msg_print(_("火炎で攻撃された！", "You are hit by fire!"));
-            get_damage = fire_dam(dam, killer, monspell, FALSE);
+			if (fuzzy) msg_print(_("火炎で攻撃された！", "You are hit by fire!"));
+			get_damage = fire_dam(dam, killer, monspell, FALSE);
 			break;
 		}
 
@@ -5336,13 +5262,13 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		case GF_POIS:
 		{
 			bool double_resist = IS_OPPOSE_POIS();
-            if (fuzzy) msg_print(_("毒で攻撃された！", "You are hit by poison!"));
+			if (fuzzy) msg_print(_("毒で攻撃された！", "You are hit by poison!"));
 
 			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())
+				 one_in_(HURT_CHANCE) && !CHECK_MULTISHADOW())
 			{
 				do_dec_stat(A_CON);
 			}
@@ -5360,7 +5286,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		case GF_NUKE:
 		{
 			bool double_resist = IS_OPPOSE_POIS();
-            if (fuzzy) msg_print(_("放射能で攻撃された！", "You are hit by radiation!"));
+			if (fuzzy) msg_print(_("放射能で攻撃された！", "You are hit by radiation!"));
 
 			if (p_ptr->resist_pois) dam = (2 * dam + 2) / 5;
 			if (double_resist) dam = (2 * dam + 2) / 5;
@@ -5371,7 +5297,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
 				if (one_in_(5)) /* 6 */
 				{
-                    msg_print(_("奇形的な変身を遂げた！", "You undergo a freakish metamorphosis!"));
+					msg_print(_("奇形的な変身を遂げた！", "You undergo a freakish metamorphosis!"));
 					if (one_in_(4)) /* 4 */
 						do_poly_self();
 					else
@@ -5389,7 +5315,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		/* Standard damage */
 		case GF_MISSILE:
 		{
-            if (fuzzy) msg_print(_("何かで攻撃された！", "You are hit by something!"));
+			if (fuzzy) msg_print(_("何かで攻撃された！", "You are hit by something!"));
 			get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
 			break;
 		}
@@ -5397,7 +5323,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		/* Holy Orb -- Player only takes partial damage */
 		case GF_HOLY_FIRE:
 		{
-            if (fuzzy) msg_print(_("何かで攻撃された！", "You are hit by something!"));
+			if (fuzzy) msg_print(_("何かで攻撃された！", "You are hit by something!"));
 			if (p_ptr->align > 10)
 				dam /= 2;
 			else if (p_ptr->align < -10)
@@ -5408,7 +5334,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
 		case GF_HELL_FIRE:
 		{
-            if (fuzzy) msg_print(_("何かで攻撃された！", "You are hit by something!"));
+			if (fuzzy) msg_print(_("何かで攻撃された！", "You are hit by something!"));
 			if (p_ptr->align > 10)
 				dam *= 2;
 			get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
@@ -5418,13 +5344,13 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		/* Arrow -- XXX no dodging */
 		case GF_ARROW:
 		{
-            if (fuzzy)
-            {
-                msg_print(_("何か鋭いもので攻撃された！", "You are hit by something sharp!"));
-            }
+			if (fuzzy)
+			{
+				msg_print(_("何か鋭いもので攻撃された！", "You are hit by something sharp!"));
+			}
 			else if ((inventory[INVEN_RARM].name1 == ART_ZANTETSU) || (inventory[INVEN_LARM].name1 == ART_ZANTETSU))
 			{
-                msg_print(_("矢を斬り捨てた！", "You cut down the arrow!"));
+				msg_print(_("矢を斬り捨てた！", "You cut down the arrow!"));
 				break;
 			}
 			get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
@@ -5439,13 +5365,13 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
 			if (!p_ptr->resist_sound && !CHECK_MULTISHADOW())
 			{
-				int k = (randint1((dam > 40) ? 35 : (dam * 3 / 4 + 5)));
-				(void)set_stun(p_ptr->stun + k);
+				int plus_stun = (randint1((dam > 40) ? 35 : (dam * 3 / 4 + 5)));
+				(void)set_stun(p_ptr->stun + plus_stun);
 			}
 
 			if (!(p_ptr->resist_fire ||
-			      IS_OPPOSE_FIRE() ||
-			      p_ptr->immune_fire))
+				IS_OPPOSE_FIRE() ||
+				p_ptr->immune_fire))
 			{
 				inven_damage(set_acid_destroy, 3);
 			}
@@ -5460,13 +5386,15 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 			if (p_ptr->resist_neth)
 			{
 				if (!prace_is_(RACE_SPECTRE))
+				{
 					dam *= 6; dam /= (randint1(4) + 7);
+				}
 			}
 			else if (!CHECK_MULTISHADOW()) drain_exp(200 + (p_ptr->exp / 100), 200 + (p_ptr->exp / 1000), 75);
 
 			if (prace_is_(RACE_SPECTRE) && !CHECK_MULTISHADOW())
 			{
-                msg_print(_("気分がよくなった。", "You feel invigorated!"));
+				msg_print(_("気分がよくなった。", "You feel invigorated!"));
 				hp_player(dam / 4);
 				learn_spell(monspell);
 			}
@@ -5482,7 +5410,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		case GF_WATER:
 		{
 			if (fuzzy) msg_print(_("何か湿ったもので攻撃された！", "You are hit by something wet!"));
-            if (!CHECK_MULTISHADOW())
+			if (!CHECK_MULTISHADOW())
 			{
 				if (!p_ptr->resist_sound)
 				{
@@ -5506,7 +5434,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		/* Chaos -- many effects */
 		case GF_CHAOS:
 		{
-            if (fuzzy) msg_print(_("無秩序の波動で攻撃された！", "You are hit by a wave of anarchy!"));
+			if (fuzzy) msg_print(_("無秩序の波動で攻撃された！", "You are hit by a wave of anarchy!"));
 			if (p_ptr->resist_chaos)
 			{
 				dam *= 6; dam /= (randint1(4) + 7);
@@ -5523,7 +5451,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 					(void)set_image(p_ptr->image + randint1(10));
 					if (one_in_(3))
 					{
-                        msg_print(_("あなたの身体はカオスの力で捻じ曲げられた！", "Your body is twisted by chaos!"));
+						msg_print(_("あなたの身体はカオスの力で捻じ曲げられた！", "Your body is twisted by chaos!"));
 						(void)gain_random_mutation(0);
 					}
 				}
@@ -5575,8 +5503,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 			}
 			else if (!CHECK_MULTISHADOW())
 			{
-				int k = (randint1((dam > 90) ? 35 : (dam / 3 + 5)));
-				(void)set_stun(p_ptr->stun + k);
+				int plus_stun = (randint1((dam > 90) ? 35 : (dam / 3 + 5)));
+				(void)set_stun(p_ptr->stun + plus_stun);
 			}
 
 			if (!p_ptr->resist_sound || one_in_(13))
@@ -5677,7 +5605,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		}
 
 		/* Inertia -- slowness */
-		case GF_INERTIA:
+		case GF_INERTIAL:
 		{
 			if (fuzzy) msg_print(_("何か遅いもので攻撃された！", "You are hit by something slow!"));
 			if (!CHECK_MULTISHADOW()) (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE);
@@ -5700,7 +5628,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
 			if (prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE))
 			{
-                if (!CHECK_MULTISHADOW()) msg_print(_("光で肉体が焦がされた！", "The light scorches your flesh!"));
+				if (!CHECK_MULTISHADOW()) msg_print(_("光で肉体が焦がされた！", "The light scorches your flesh!"));
 				dam *= 2;
 			}
 			else if (prace_is_(RACE_S_FAIRY))
@@ -5715,12 +5643,11 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 			{
 				p_ptr->wraith_form = 0;
 				msg_print(_("閃光のため非物質的な影の存在でいられなくなった。",
-                    "The light forces you out of your incorporeal shadow form."));
+					"The light forces you out of your incorporeal shadow form."));
 
 				p_ptr->redraw |= PR_MAP;
 				/* Update monsters */
 				p_ptr->update |= (PU_MONSTERS);
-				/* Window stuff */
 				p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 				/* Redraw status bar */
@@ -5757,7 +5684,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 			{
 				dam *= 4;
 				dam /= (randint1(4) + 7);
-                msg_print(_("時間が通り過ぎていく気がする。", "You feel as if time is passing you by."));
+				msg_print(_("時間が通り過ぎていく気がする。", "You feel as if time is passing you by."));
 			}
 			else if (!CHECK_MULTISHADOW())
 			{
@@ -5766,7 +5693,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 					case 1: case 2: case 3: case 4: case 5:
 					{
 						if (p_ptr->prace == RACE_ANDROID) break;
-                        msg_print(_("人生が逆戻りした気がする。", "You feel life has clocked back."));
+						msg_print(_("人生が逆戻りした気がする。", "You feel life has clocked back."));
 						lose_exp(100 + (p_ptr->exp / 100) * MON_DRAIN_LIFE);
 						break;
 					}
@@ -5775,16 +5702,16 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 					{
 						switch (randint1(6))
 						{
-                            case 1: k = A_STR; act = _("強く", "strong"); break;
-                            case 2: k = A_INT; act = _("聡明で", "bright"); break;
-                            case 3: k = A_WIS; act = _("賢明で", "wise"); break;
-                            case 4: k = A_DEX; act = _("器用で", "agile"); break;
-                            case 5: k = A_CON; act = _("健康で", "hale"); break;
-                            case 6: k = A_CHR; act = _("美しく", "beautiful"); break;
+							case 1: k = A_STR; act = _("強く", "strong"); break;
+							case 2: k = A_INT; act = _("聡明で", "bright"); break;
+							case 3: k = A_WIS; act = _("賢明で", "wise"); break;
+							case 4: k = A_DEX; act = _("器用で", "agile"); break;
+							case 5: k = A_CON; act = _("健康で", "hale"); break;
+							case 6: k = A_CHR; act = _("美しく", "beautiful"); break;
 						}
 
 						msg_format(_("あなたは以前ほど%sなくなってしまった...。", 
-                                     "You're not as %s as you used to be..."), act);
+									 "You're not as %s as you used to be..."), act);
 
 						p_ptr->stat_cur[k] = (p_ptr->stat_cur[k] * 3) / 4;
 						if (p_ptr->stat_cur[k] < 3) p_ptr->stat_cur[k] = 3;
@@ -5795,7 +5722,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 					case 10:
 					{
 						msg_print(_("あなたは以前ほど力強くなくなってしまった...。", 
-                                    "You're not as powerful as you used to be..."));
+									"You're not as powerful as you used to be..."));
 
 						for (k = 0; k < 6; k++)
 						{
@@ -5816,7 +5743,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		case GF_GRAVITY:
 		{
 			if (fuzzy) msg_print(_("何か重いもので攻撃された！", "You are hit by something heavy!"));
-            msg_print(_("周辺の重力がゆがんだ。", "Gravity warps around you."));
+				msg_print(_("周辺の重力がゆがんだ。", "Gravity warps around you."));
 
 			if (!CHECK_MULTISHADOW())
 			{
@@ -5825,8 +5752,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 					(void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE);
 				if (!(p_ptr->resist_sound || p_ptr->levitation))
 				{
-					int k = (randint1((dam > 90) ? 35 : (dam / 3 + 5)));
-					(void)set_stun(p_ptr->stun + k);
+					int plus_stun = (randint1((dam > 90) ? 35 : (dam / 3 + 5)));
+					(void)set_stun(p_ptr->stun + plus_stun);
 				}
 			}
 			if (p_ptr->levitation)
@@ -5879,20 +5806,13 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		case GF_OLD_SLEEP:
 		{
 			if (p_ptr->free_act)  break;
-            if (fuzzy) msg_print(_("眠ってしまった！", "You fall asleep!"));
+			if (fuzzy) msg_print(_("眠ってしまった！", "You fall asleep!"));
 
 			if (ironman_nightmare)
 			{
-                msg_print(_("恐ろしい光景が頭に浮かんできた。", "A horrible vision enters your mind."));
-
-				/* Pick a nightmare */
-				get_mon_num_prep(get_nightmare, NULL);
-
+				msg_print(_("恐ろしい光景が頭に浮かんできた。", "A horrible vision enters your mind."));
 				/* Have some nightmares */
-				have_nightmare(get_mon_num(MAX_DEPTH));
-
-				/* Remove the monster restriction */
-				get_mon_num_prep(NULL, NULL);
+				sanity_blast(NULL, FALSE);
 			}
 
 			set_paralyzed(p_ptr->paralyzed + dam);
@@ -6001,15 +5921,15 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		{
 			if (CHECK_MULTISHADOW())
 			{
-                msg_print(_("攻撃は幻影に命中し、あなたには届かなかった。", "The attack hits Shadow, you are unharmed!"));
+				msg_print(_("攻撃は幻影に命中し、あなたには届かなかった。", "The attack hits Shadow, you are unharmed!"));
 			}
 			else if (p_ptr->csp)
 			{
 				/* Basic message */
 				if (who > 0) 
-                    msg_format(_("%^sに精神エネルギーを吸い取られてしまった！", "%^s draws psychic energy from you!"), m_name);
+					msg_format(_("%^sに精神エネルギーを吸い取られてしまった！", "%^s draws psychic energy from you!"), m_name);
 				else 
-                    msg_print(_("精神エネルギーを吸い取られてしまった！", "Your psychic energy is drawn!"));
+					msg_print(_("精神エネルギーを吸い取られてしまった！", "Your psychic energy is drawn!"));
 
 				/* Full drain */
 				if (dam >= p_ptr->csp)
@@ -6030,7 +5950,6 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 				/* Redraw mana */
 				p_ptr->redraw |= (PR_MANA);
 
-				/* Window stuff */
 				p_ptr->window |= (PW_PLAYER);
 				p_ptr->window |= (PW_SPELL);
 
@@ -6050,7 +5969,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 						/* Special message */
 						if (m_ptr->ml)
 						{
-                            msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), m_name);
+							msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), m_name);
 						}
 					}
 				}
@@ -6065,14 +5984,14 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		{
 			if ((randint0(100 + rlev / 2) < MAX(5, p_ptr->skill_sav)) && !CHECK_MULTISHADOW())
 			{
-                msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
+				msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
 				learn_spell(monspell);
 			}
 			else
 			{
 				if (!CHECK_MULTISHADOW())
 				{
-                    msg_print(_("霊的エネルギーで精神が攻撃された。", "Your mind is blasted by psyonic energy."));
+					msg_print(_("霊的エネルギーで精神が攻撃された。", "Your mind is blasted by psyonic energy."));
 
 					if (!p_ptr->resist_conf)
 					{
@@ -6102,15 +6021,15 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		case GF_BRAIN_SMASH:
 		{
 			if ((randint0(100 + rlev / 2) < MAX(5, p_ptr->skill_sav)) && !CHECK_MULTISHADOW())
-            {
-                msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
+			{
+				msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
 				learn_spell(monspell);
 			}
 			else
 			{
 				if (!CHECK_MULTISHADOW())
-                {
-                    msg_print(_("霊的エネルギーで精神が攻撃された。", "Your mind is blasted by psyonic energy."));
+				{
+					msg_print(_("霊的エネルギーで精神が攻撃された。", "Your mind is blasted by psyonic energy."));
 
 					p_ptr->csp -= 100;
 					if (p_ptr->csp < 0)
@@ -6156,8 +6075,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		case GF_CAUSE_1:
 		{
 			if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
-            {
-                msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
+			{
+				msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
 				learn_spell(monspell);
 			}
 			else
@@ -6172,8 +6091,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		case GF_CAUSE_2:
 		{
 			if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
-            {
-                msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
+			{
+				msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
 				learn_spell(monspell);
 			}
 			else
@@ -6188,8 +6107,8 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		case GF_CAUSE_3:
 		{
 			if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
-            {
-                msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
+			{
+				msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
 				learn_spell(monspell);
 			}
 			else
@@ -6205,7 +6124,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		{
 			if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !(m_ptr->r_idx == MON_KENSHIROU) && !CHECK_MULTISHADOW())
 			{
-                msg_print(_("しかし秘孔を跳ね返した！", "You resist the effects!"));
+				msg_print(_("しかし秘孔を跳ね返した！", "You resist the effects!"));
 				learn_spell(monspell);
 			}
 			else
@@ -6220,15 +6139,15 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 		case GF_HAND_DOOM:
 		{
 			if ((randint0(100 + rlev/2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW())
-            {
-                msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
+			{
+				msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
 				learn_spell(monspell);
 			}
 			else
 			{
 				if (!CHECK_MULTISHADOW())
 				{
-                    msg_print(_("あなたは命が薄まっていくように感じた！", "You feel your life fade away!"));
+					msg_print(_("あなたは命が薄まっていくように感じた！", "You feel your life fade away!"));
 					curse_equipment(40, 20);
 				}
 
@@ -6271,8 +6190,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 	}
 
 
-	/* Disturb */
-	disturb(1, 1);
+	disturb(TRUE, TRUE);
 
 
 	if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && who && (who != p_ptr->riding))
@@ -6288,58 +6206,58 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 /*
  * Find the distance from (x, y) to a line.
  */
-int dist_to_line(int y, int x, int y1, int x1, int y2, int x2)
+POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2)
 {
 	/* Vector from (x, y) to (x1, y1) */
-	int py = y1 - y;
-	int px = x1 - x;
+	POSITION py = y1 - y;
+	POSITION px = x1 - x;
 
 	/* Normal vector */
-	int ny = x2 - x1;
-	int nx = y1 - y2;
+	POSITION ny = x2 - x1;
+	POSITION nx = y1 - y2;
 
-   /* Length of N */
-	int pd = distance(y1, x1, y, x);
-	int nd = distance(y1, x1, y2, x2);
+	/* Length of N */
+	POSITION pd = distance(y1, x1, y, x);
+	POSITION nd = distance(y1, x1, y2, x2);
 
 	if (pd > nd) return distance(y, x, y2, x2);
 
 	/* Component of P on N */
 	nd = ((nd) ? ((py * ny + px * nx) / nd) : 0);
 
-   /* Absolute value */
-   return((nd >= 0) ? nd : 0 - nd);
+	/* Absolute value */
+	return((nd >= 0) ? nd : 0 - nd);
 }
 
 
 
 /*
- * XXX XXX XXX
+ * 
  * Modified version of los() for calculation of disintegration balls.
  * Disintegration effects are stopped by permanent walls.
  */
-bool in_disintegration_range(int y1, int x1, int y2, int x2)
+bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
 {
 	/* Delta */
-	int dx, dy;
+	POSITION dx, dy;
 
 	/* Absolute */
-	int ax, ay;
+	POSITION ax, ay;
 
 	/* Signs */
-	int sx, sy;
+	POSITION sx, sy;
 
 	/* Fractions */
-	int qx, qy;
+	POSITION qx, qy;
 
 	/* Scanners */
-	int tx, ty;
+	POSITION tx, ty;
 
 	/* Scale factors */
-	int f1, f2;
+	POSITION f1, f2;
 
 	/* Slope, or 1/Slope, of LOS */
-	int m;
+	POSITION m;
 
 
 	/* Extract the offset */
@@ -6544,10 +6462,10 @@ bool in_disintegration_range(int y1, int x1, int y2, int x2)
 /*
  * breath shape
  */
-void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int 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)
 {
-	int by = y1;
-	int bx = x1;
+	POSITION by = y1;
+	POSITION bx = x1;
 	int brad = 0;
 	int brev = rad * rad / dist;
 	int bdis = 0;
@@ -6557,13 +6475,13 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte
 
 	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)
@@ -6773,17 +6691,17 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte
  * and "update_view()" and "update_monsters()" need to be called.
  * </pre>
  */
-bool project(int who, int rad, int y, int x, int dam, int typ, int 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;
 
-	int y1, x1;
-	int y2, x2;
-	int by, bx;
+	POSITION y1, x1;
+	POSITION y2, x2;
+	POSITION by, bx;
 
 	int dist_hack = 0;
 
-	int y_saver, x_saver; /* For reflecting monsters */
+	POSITION y_saver, x_saver; /* For reflecting monsters */
 
 	int msec = delay_factor * delay_factor * delay_factor;
 
@@ -6814,13 +6732,13 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 	int grids = 0;
 
 	/* Coordinates of the affected grids */
-	byte gx[1024], gy[1024];
+	POSITION gx[1024], gy[1024];
 
 	/* Encoded "radius" info (see above) */
-	byte gm[32];
+	POSITION gm[32];
 
 	/* Actual radius encoded in gm[] */
-	int gm_rad = rad;
+	POSITION gm_rad = rad;
 
 	bool jump = FALSE;
 
@@ -6837,8 +6755,8 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 	rakubadam_m = 0;
 
 	/* Default target of monsterspell is player */
-	monster_target_y=py;
-	monster_target_x=px;
+	monster_target_y = p_ptr->y;
+	monster_target_x = p_ptr->x;
 
 	/* Hack -- Jump to target */
 	if (flg & (PROJECT_JUMP))
@@ -6855,8 +6773,8 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 	/* Start at player */
 	else if (who <= 0)
 	{
-		x1 = px;
-		y1 = py;
+		x1 = p_ptr->x;
+		y1 = p_ptr->y;
 	}
 
 	/* Start at monster */
@@ -6867,7 +6785,6 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 		monster_desc(who_name, &m_list[who], MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
 	}
 
-	/* Oops */
 	else
 	{
 		x1 = x;
@@ -6933,8 +6850,6 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 	/* 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 */
@@ -7024,27 +6939,27 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 				monster_target_y=(s16b)y;
 				monster_target_x=(s16b)x;
 
-				remove_mirror(y,x);
-				next_mirror( &oy,&ox,y,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++ )
+				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(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];
+						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);
@@ -7052,28 +6967,29 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 				last_i = i;
 			}
 		}
-		for( i = last_i ; i < path_n ; i++ )
+		for(i = last_i ; i < path_n ; i++)
 		{
-			int x,y;
-			y = GRID_Y(path_g[i]);
-			x = GRID_X(path_g[i]);
-			if(project_m(0,0,y,x,dam,GF_SEEKER,flg,TRUE))
-			  notice=TRUE;
+			int 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))
+				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(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, py, px, dam, GF_SEEKER);
 		}
 		return notice;
 	}
@@ -7187,25 +7103,25 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 		}
 		for( i = 0; i < path_n ; i++ )
 		{
-			int x,y;
-			y = GRID_Y(path_g[i]);
-			x = GRID_X(path_g[i]);
-			(void)project_m(0,0,y,x,dam,GF_SUPER_RAY,flg,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];
+			int 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);
+			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_SUPER_RAY);
+			(void)project_f(0, 0, py, px, dam, GF_SUPER_RAY);
 		}
 		return notice;
 	}
@@ -7336,11 +7252,11 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 		/*
 		 * Create a conical breath attack
 		 *
-		 *         ***
-		 *     ********
+		 *       ***
+		 *   ********
 		 * D********@**
-		 *     ********
-		 *         ***
+		 *   ********
+		 *       ***
 		 */
 
 		if (breath)
@@ -7480,7 +7396,7 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 	if (flg & PROJECT_KILL)
 	{
 		see_s_msg = (who > 0) ? is_seen(&m_list[who]) :
-			(!who ? TRUE : (player_can_see_bold(y1, x1) && projectable(py, px, y1, x1)));
+			(!who ? TRUE : (player_can_see_bold(y1, x1) && projectable(p_ptr->y, p_ptr->x, y1, x1)));
 	}
 
 
@@ -7582,10 +7498,10 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 				monster_race *ref_ptr = &r_info[m_ptr->r_idx];
 
 				if ((flg & PROJECT_REFLECTABLE) && cave[y][x].m_idx && (ref_ptr->flags2 & RF2_REFLECTING) &&
-				    ((cave[y][x].m_idx != p_ptr->riding) || !(flg & PROJECT_PLAYER)) &&
-				    (!who || dist_hack > 1) && !one_in_(10))
+					((cave[y][x].m_idx != p_ptr->riding) || !(flg & PROJECT_PLAYER)) &&
+					(!who || dist_hack > 1) && !one_in_(10))
 				{
-					byte t_y, t_x;
+					POSITION t_y, t_x;
 					int max_attempts = 10;
 
 					/* Choose 'new' target */
@@ -7603,14 +7519,15 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 						t_x = x_saver;
 					}
 
+					sound(SOUND_REFLECT);
 					if (is_seen(m_ptr))
 					{
 						if ((m_ptr->r_idx == MON_KENSHIROU) || (m_ptr->r_idx == MON_RAOU))
-                            msg_print(_("「北斗神拳奥義・二指真空把！」", "The attack bounces!"));
+							msg_print(_("「北斗神拳奥義・二指真空把！」", "The attack bounces!"));
 						else if (m_ptr->r_idx == MON_DIO) 
-                            msg_print(_("ディオ・ブランドーは指一本で攻撃を弾き返した！", "The attack bounces!"));
+							msg_print(_("ディオ・ブランドーは指一本で攻撃を弾き返した！", "The attack bounces!"));
 						else 
-                            msg_print(_("攻撃は跳ね返った！", "The attack bounces!"));
+							msg_print(_("攻撃は跳ね返った！", "The attack bounces!"));
 					}
 					if (is_original_ap_and_seen(m_ptr)) ref_ptr->r_flags2 |= RF2_REFLECTING;
 
@@ -7717,7 +7634,6 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 		/* Player affected one monster (without "jumping") */
 		if (!who && (project_m_n == 1) && !jump)
 		{
-			/* Location */
 			x = project_m_x;
 			y = project_m_y;
 
@@ -7824,14 +7740,14 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
 		{
 			if (rakuba(rakubadam_m, FALSE))
 			{
-                msg_format(_("%^sに振り落とされた！", "%^s has thrown you off!"), m_name);
+				msg_format(_("%^sに振り落とされた！", "%^s has thrown you off!"), m_name);
 			}
 		}
 		if (p_ptr->riding && rakubadam_p > 0)
 		{
 			if(rakuba(rakubadam_p, FALSE))
 			{
-                msg_format(_("%^sから落ちてしまった！", "You have fallen from %s."), m_name);
+				msg_format(_("%^sから落ちてしまった！", "You have fallen from %s."), m_name);
 			}
 		}
 	}
@@ -7845,63 +7761,62 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
  * @param dam ダメージ量
  * @return 効果があったらTRUEを返す
  */
-bool binding_field( int 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=py;
-	monster_target_x=px;
+	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++ )
-		{
-			if( is_mirror_grid(&cave[y][x]) &&
-			    distance(py,px,y,x) <= MAX_RANGE &&
-			    distance(py,px,y,x) != 0 &&
-			    player_has_los_bold(y,x) &&
-			    projectable(py, px, y, x)
-			    ){
-				mirror_y[mirror_num]=y;
-				mirror_x[mirror_num]=x;
+		for (y = 0; y < cur_hgt; y++)
+		{
+			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_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]=py;
-	point_x[2]=px;
-
-	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];
@@ -7912,78 +7827,78 @@ bool binding_field( int 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(py, px, y, x)) {
+				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(py, px, y, x)) {
-					(void)project_f(0,0,y,x,dam,GF_MANA); 
+				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);
 				}
 			}
 		}
 	}
-	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(py, px, y, x)) {
-					(void)project_o(0,0,y,x,dam,GF_MANA); 
+				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);
 				}
 			}
 		}
 	}
-	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(py, px, y, x)) {
-					(void)project_m(0,0,y,x,dam,GF_MANA,
-					  (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP),TRUE);
+				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);
 				}
 			}
 		}
 	}
-	if( one_in_(7) ){
-        msg_print(_("鏡が結界に耐えきれず、壊れてしまった。", "The field broke a mirror"));
-		remove_mirror(point_y[0],point_x[0]);
+	if (one_in_(7)) {
+		msg_print(_("鏡が結界に耐えきれず、壊れてしまった。", "The field broke a mirror"));
+		remove_mirror(point_y[0], point_x[0]);
 	}
 
 	return TRUE;
@@ -7994,22 +7909,22 @@ bool binding_field( int dam )
  * @param dam ダメージ量
  * @return 効果があったらTRUEを返す
  */
-void seal_of_mirror( int 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++)
 		{
-			if( is_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);
 					}
 				}
 			}
@@ -8017,4 +7932,4 @@ void seal_of_mirror( int dam )
 	}
 	return;
 }
-     
+