From 2f953c7660fa016d245aa35f036b02511c21d733 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Fri, 2 Nov 2018 20:44:02 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37287=20#37353=20=E5=9E=8B?=
 =?utf8?q?=E3=81=AE=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       |  4 ++--
 src/floor-streams.c | 14 ++++----------
 src/monster2.c      |  2 +-
 src/object2.c       |  7 ++-----
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/externs.h b/src/externs.h
index 8261fb0e4..905e98fc5 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -749,7 +749,7 @@ extern void dice_to_string(int base_damage, int dice_num, int dice_side, int dic
 extern cptr horror_desc[MAX_SAN_HORROR];
 extern cptr funny_desc[MAX_SAN_FUNNY];
 extern cptr funny_comments[MAX_SAN_COMMENT];
-extern void set_target(monster_type *m_ptr, int y, int x);
+extern void set_target(monster_type *m_ptr, POSITION y, POSITION x);
 extern void reset_target(monster_type *m_ptr);
 extern monster_race *real_r_ptr(monster_type *m_ptr);
 extern void delete_monster_idx(MONSTER_IDX i);
@@ -806,7 +806,7 @@ extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode);
 /* object2.c */
 extern void excise_object_idx(int o_idx);
 extern void delete_object_idx(int o_idx);
-extern void delete_object(int y, int x);
+extern void delete_object(POSITION y, POSITION x);
 extern void compact_objects(int size);
 extern void wipe_o_list(void);
 extern IDX o_pop(void);
diff --git a/src/floor-streams.c b/src/floor-streams.c
index 755705c7a..24e3fa8be 100644
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -311,20 +311,14 @@ void build_streamer(IDX feat, int chance)
 						{
 							char o_name[MAX_NLEN];
 							object_desc(o_name, o_ptr, (OD_NAME_ONLY | OD_STORE));
-#ifdef JP
-							msg_format("伝説のアイテム (%s) はストリーマーにより削除された。", o_name);
-#else
-							msg_format("Artifact (%s) was deleted by streamer.", o_name);
-#endif
+							msg_format(_("伝説のアイテム (%s) はストリーマーにより削除された。",
+								"Artifact (%s) was deleted by streamer."), o_name);
 						}
 					}
 					else if (cheat_peek && o_ptr->art_name)
 					{
-#ifdef JP
-						msg_print("ランダム・アーティファクトの1つはストリーマーにより削除された。");
-#else
-						msg_print("One of the random artifacts was deleted by streamer.");
-#endif
+						msg_print(_("ランダム・アーティファクトの1つはストリーマーにより削除された。",
+							"One of the random artifacts was deleted by streamer."));
 					}
 				}
 
diff --git a/src/monster2.c b/src/monster2.c
index d94883a82..58786bf0f 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -172,7 +172,7 @@ cptr funny_comments[MAX_SAN_COMMENT] =
  * @param x 目標x座標
  * @return なし
  */
-void set_target(monster_type *m_ptr, int y, int x)
+void set_target(monster_type *m_ptr, POSITION y, POSITION x)
 {
 	m_ptr->target_y = y;
 	m_ptr->target_x = x;
diff --git a/src/object2.c b/src/object2.c
index 8853939d1..6a9b9c95e 100644
--- a/src/object2.c
+++ b/src/object2.c
@@ -226,17 +226,14 @@ void delete_object_idx(int o_idx)
  * @param x 削除したフロアマスのX座標
  * @return なし
  */
-void delete_object(int y, int x)
+void delete_object(POSITION y, POSITION x)
 {
 	cave_type *c_ptr;
-
-	s16b this_o_idx, next_o_idx = 0;
-
+	OBJECT_IDX this_o_idx, next_o_idx = 0;
 
 	/* Refuse "illegal" locations */
 	if (!in_bounds(y, x)) return;
 
-
 	/* Grid */
 	c_ptr = &cave[y][x];
 
-- 
2.11.0