From 28d6c0667b5ed43f9f0354f5b374f00d4d3f96e5 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Sat, 24 Nov 2018 15:16:55 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E5=9E=8B=E3=81=AE?=
 =?utf8?q?=E7=BD=AE=E6=8F=9B=E3=80=82=20/=20Type=20replacement.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/externs.h  |  5 +----
 src/mspells1.c |  2 +-
 src/mspells2.c | 18 +++++++-----------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/externs.h b/src/externs.h
index 0e03c9b44..4400e34ef 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1366,7 +1366,7 @@ extern void bolt(MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int d
 extern void breath(POSITION y, POSITION x, MONSTER_IDX m_idx, EFFECT_ID typ, int dam_hp, POSITION rad, bool breath, int monspell, int target_type);
 
 /* mspells2.c */
-extern void get_project_point(int sy, int sx, int *ty, int *tx, BIT_FLAGS flg);
+extern void get_project_point(POSITION sy, POSITION sx, POSITION *ty, POSITION *tx, BIT_FLAGS flg);
 extern bool monst_spell_monst(MONSTER_IDX m_idx);
 
 /* mspells3.c */
@@ -1442,20 +1442,17 @@ extern void fsetfileinfo(cptr path, u32b fcreator, u32b ftype);
 /* extern int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, ...); */
 #endif
 
-
 /* util.c */
 extern void repeat_push(COMMAND_CODE what);
 extern bool repeat_pull(COMMAND_CODE *what);
 extern void repeat_check(void);
 
-
 /* variable.c */
 extern bool easy_open;
 
 /* cmd2.c */
 extern bool easy_open_door(POSITION y, POSITION x);
 
-
 /* variable.c */
 extern bool easy_disarm;
 
diff --git a/src/mspells1.c b/src/mspells1.c
index d4819c826..24f3f4a85 100644
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1467,7 +1467,7 @@ bool make_attack_spell(MONSTER_IDX m_idx)
 		}
 		else if ((f5 & RF5_BA_LITE) && (m_ptr->cdis <= MAX_RANGE))
 		{
-			int by = y, bx = x;
+			POSITION by = y, bx = x;
 			get_project_point(m_ptr->fy, m_ptr->fx, &by, &bx, 0L);
 			if ((distance(by, bx, y, x) <= 3) && los(by, bx, y, x) && one_in_(5))
 			{
diff --git a/src/mspells2.c b/src/mspells2.c
index 9a272082c..ddbc4fa65 100644
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -191,7 +191,7 @@ static bool breath_direct(POSITION y1, POSITION x1, POSITION y2, POSITION x2, PO
  * @param flg 判定のフラグ配列
  * @return なし
  */
-void get_project_point(int sy, int sx, int *ty, int *tx, BIT_FLAGS flg)
+void get_project_point(POSITION sy, POSITION sx, POSITION *ty, POSITION *tx, BIT_FLAGS flg)
 {
 	u16b path_g[128];
 	int  path_n, i;
@@ -474,8 +474,8 @@ bool monst_spell_monst(MONSTER_IDX m_idx)
 			    (f5 & RF5_BALL_MASK) ||
 			    (f6 & RF6_BALL_MASK))
 			{
-				int real_y = y;
-				int real_x = x;
+				POSITION real_y = y;
+				POSITION real_x = x;
 
 				get_project_point(m_ptr->fy, m_ptr->fx, &real_y, &real_x, 0L);
 
@@ -505,17 +505,15 @@ bool monst_spell_monst(MONSTER_IDX m_idx)
 
 			if (f4 & RF4_ROCKET)
 			{
-				int real_y = y;
-				int real_x = x;
+				POSITION real_y = y;
+				POSITION real_x = x;
 
 				get_project_point(m_ptr->fy, m_ptr->fx, &real_y, &real_x, PROJECT_STOP);
 				if (projectable(real_y, real_x, p_ptr->y, p_ptr->x) && (distance(real_y, real_x, p_ptr->y, p_ptr->x) <= 2))
 					f4 &= ~(RF4_ROCKET);
 			}
 
-			if (((f4 & RF4_BEAM_MASK) ||
-			     (f5 & RF5_BEAM_MASK) ||
-			     (f6 & RF6_BEAM_MASK)) &&
+			if (((f4 & RF4_BEAM_MASK) || (f5 & RF5_BEAM_MASK) || (f6 & RF6_BEAM_MASK)) &&
 			    !direct_beam(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, m_ptr))
 			{
 				f4 &= ~(RF4_BEAM_MASK);
@@ -523,9 +521,7 @@ bool monst_spell_monst(MONSTER_IDX m_idx)
 				f6 &= ~(RF6_BEAM_MASK);
 			}
 
-			if ((f4 & RF4_BREATH_MASK) ||
-			    (f5 & RF5_BREATH_MASK) ||
-			    (f6 & RF6_BREATH_MASK))
+			if ((f4 & RF4_BREATH_MASK) || (f5 & RF5_BREATH_MASK) || (f6 & RF6_BREATH_MASK))
 			{
 				/* Expected breath radius */
 				POSITION rad = (r_ptr->flags2 & RF2_POWERFUL) ? 3 : 2;
-- 
2.11.0