From c44bb9d3c43eba6934b3c504c6eec5aadd804cb0 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Wed, 30 Jan 2019 00:44:55 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=83=A1=E3=83=83?=
 =?utf8?q?=E3=82=BB=E3=83=BC=E3=82=B8=E6=95=B4=E7=90=86=E3=80=82=20/=20Ref?=
 =?utf8?q?actor=20messages.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd-item.c | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 8fedc95b9..ae3e71f1b 100644
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -558,7 +558,6 @@ void do_cmd_takeoff(void)
 		}
 	}
 
-	/* Take a partial turn */
 	p_ptr->energy_use = 50;
 
 	/* Take off the item */
@@ -611,8 +610,6 @@ void do_cmd_drop(void)
 		if (amt <= 0) return;
 	}
 
-
-	/* Take a partial turn */
 	p_ptr->energy_use = 50;
 
 	/* Drop (some of) the item */
@@ -958,10 +955,8 @@ void do_cmd_inscribe(void)
 static void do_cmd_refill_lamp(void)
 {
 	OBJECT_IDX item;
-
 	object_type *o_ptr;
 	object_type *j_ptr;
-
 	concptr q, s;
 
 	/* Restrict the choices */
@@ -973,7 +968,6 @@ static void do_cmd_refill_lamp(void)
 	o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR));
 	if (!o_ptr) return;
 
-	/* Take a partial turn */
 	p_ptr->energy_use = 50;
 
 	/* Access the lantern */
@@ -1060,7 +1054,6 @@ static void do_cmd_refill_torch(void)
 	o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR));
 	if (!o_ptr) return;
 
-	/* Take a partial turn */
 	p_ptr->energy_use = 50;
 
 	/* Access the primary torch */
@@ -1225,25 +1218,13 @@ void do_cmd_locate(void)
 		/* Describe the location */
 		if ((y2 == y1) && (x2 == x1))
 		{
-#ifdef JP
-			strcpy(tmp_val, "真上");
-#else
-			tmp_val[0] = '\0';
-#endif
-
+			strcpy(tmp_val, _("真上", "\0"));
 		}
 		else
 		{
-#ifdef JP
 			sprintf(tmp_val, "%s%s",
-				((y2 < y1) ? "北" : (y2 > y1) ? "南" : ""),
-				((x2 < x1) ? "西" : (x2 > x1) ? "東" : ""));
-#else
-			sprintf(tmp_val, "%s%s of",
-				((y2 < y1) ? " North" : (y2 > y1) ? " South" : ""),
-				((x2 < x1) ? " West" : (x2 > x1) ? " East" : ""));
-#endif
-
+				((y2 < y1) ? _("北", " North") : (y2 > y1) ? _("南", " South") : ""),
+				((x2 < x1) ? _("西", " West") : (x2 > x1) ? _("東", " East") : ""));
 		}
 
 		/* Prepare to ask which way to look */
-- 
2.11.0