From 64d20b869609138955ca86104ba5e218f5b702e2 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Wed, 12 Dec 2018 20:42:08 +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/birth.c       | 52 +++++++++++-----------------------------------------
 src/rooms-vault.c |  4 ++--
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/src/birth.c b/src/birth.c
index 74db39763..fbac11ea3 100644
--- a/src/birth.c
+++ b/src/birth.c
@@ -2555,11 +2555,8 @@ static bool get_player_race(void)
 
 	/* Extra info */
 	clear_from(10);
-#ifdef JP
-	put_str("注意：《種族》によってキャラクターの先天的な資質やボーナスが変化します。", 23, 5);
-#else
-	put_str("Note: Your 'race' determines various intrinsic factors and bonuses.", 23 ,5);
-#endif
+	put_str(_("注意：《種族》によってキャラクターの先天的な資質やボーナスが変化します。",
+	"Note: Your 'race' determines various intrinsic factors and bonuses."), 23, 5);
 
 	/* Dump races */
 	for (n = 0; n < MAX_RACES; n++)
@@ -2582,11 +2579,7 @@ static bool get_player_race(void)
 
 	}
 
-#ifdef JP
-	sprintf(cur, "%c%c%s", '*', p2, "ランダム");
-#else
-	sprintf(cur, "%c%c %s", '*', p2, "Random");
-#endif
+	sprintf(cur, "%c%c%s", '*', p2, _("ランダム", "Random");
 
 	/* Choose */
 	k = -1;
@@ -2635,11 +2628,7 @@ static bool get_player_race(void)
 
 		if (k >= 0) break;
 
-#ifdef JP
-		sprintf(buf, "種族を選んで下さい (%c-%c) ('='初期オプション設定): ", sym[0], sym[MAX_RACES-1]);
-#else
-		sprintf(buf, "Choose a race (%c-%c) ('=' for options): ", sym[0], sym[MAX_RACES-1]);
-#endif
+		sprintf(buf, _("種族を選んで下さい (%c-%c) ('='初期オプション設定): ", "Choose a race (%c-%c) ('=' for options): "), sym[0], sym[MAX_RACES-1]);
 
 		put_str(buf, 10, 10);
 		c = inkey();
@@ -2705,11 +2694,7 @@ static bool get_player_race(void)
 		else if (c == '=')
 		{
 			screen_save();
-#ifdef JP
-			do_cmd_options_aux(OPT_PAGE_BIRTH, "初期オプション((*)はスコアに影響)");
-#else
-			do_cmd_options_aux(OPT_PAGE_BIRTH, "Birth Option((*)s effect score)");
-#endif
+			do_cmd_options_aux(OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth Option((*)s effect score)"));
 			screen_load();
 		}
 		else if (c !='2' && c !='4' && c !='6' && c !='8') bell();
@@ -2744,17 +2729,11 @@ static bool get_player_class(void)
 
 	/* Extra info */
 	clear_from(10);
-#ifdef JP
-	put_str("注意：《職業》によってキャラクターの先天的な能力やボーナスが変化します。", 23, 5);
-#else
-	put_str("Note: Your 'class' determines various intrinsic abilities and bonuses.", 23, 5);
-#endif
+	put_str(_("注意：《職業》によってキャラクターの先天的な能力やボーナスが変化します。",
+		"Note: Your 'class' determines various intrinsic abilities and bonuses."), 23, 5);
 
-#ifdef JP
-	put_str("()で囲まれた選択肢はこの種族には似合わない職業です。", 11, 10);
-#else
-	put_str("Any entries in parentheses should only be used by advanced players.", 11, 5);
-#endif
+	put_str(_("()で囲まれた選択肢はこの種族には似合わない職業です。", 
+		"Any entries in parentheses should only be used by advanced players."), 11, 5);
 
 
 	/* Dump classes */
@@ -2850,11 +2829,7 @@ static bool get_player_class(void)
 
 		if (k >= 0) break;
 
-#ifdef JP
-		sprintf(buf, "職業を選んで下さい (%c-%c) ('='初期オプション設定): ", sym[0], sym[MAX_CLASS_CHOICE-1]);
-#else
-		sprintf(buf, "Choose a class (%c-%c) ('=' for options): ",  sym[0], sym[MAX_CLASS_CHOICE-1]);
-#endif
+		sprintf(buf, _("職業を選んで下さい (%c-%c) ('='初期オプション設定): ", "Choose a class (%c-%c) ('=' for options): "), sym[0], sym[MAX_CLASS_CHOICE-1]);
 
 		put_str(buf, 10, 10);
 		c = inkey();
@@ -2920,12 +2895,7 @@ static bool get_player_class(void)
 		else if (c == '=')
 		{
 			screen_save();
-#ifdef JP
-			do_cmd_options_aux(OPT_PAGE_BIRTH, "初期オプション((*)はスコアに影響)");
-#else
-			do_cmd_options_aux(OPT_PAGE_BIRTH, "Birth Option((*)s effect score)");
-#endif
-
+			do_cmd_options_aux(OPT_PAGE_BIRTH, _("初期オプション((*)はスコアに影響)", "Birth Option((*)s effect score)"));
 			screen_load();
 		}
 		else if (c !='2' && c !='4' && c !='6' && c !='8') bell();
diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index e314482b6..1ca6efc18 100644
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -57,8 +57,8 @@ static void build_bubble_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
 			}
 		}
 
-		center[i].x = (byte_hack)x;
-		center[i].y = (byte_hack)y;
+		center[i].x = x;
+		center[i].y = y;
 	}
 
 
-- 
2.11.0