[Refactor] #37353 メッセージ整理。 / Refactor messages.

diff --git a/src/birth.c b/src/birth.c
index 8eea88e..cce13cf 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -4697,49 +4697,25 @@ void player_birth(void)
        message_add(" ");
        message_add("  ");
 
-#ifdef JP
-       do_cmd_write_nikki(NIKKI_GAMESTART, 1, "-------- 新規ゲーム開始 --------");
-#else
-       do_cmd_write_nikki(NIKKI_GAMESTART, 1, "-------- Start New Game --------");
-#endif
+       do_cmd_write_nikki(NIKKI_GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "-------- Start New Game --------"));
        do_cmd_write_nikki(NIKKI_HIGAWARI, 0, NULL);
 
-#ifdef JP
-       sprintf(buf,"                            性別に%sを選択した。", sex_info[p_ptr->psex].title);
-#else
-       sprintf(buf,"                            choose %s personality.", sex_info[p_ptr->psex].title);
-#endif
+       sprintf(buf,_("                            性別に%sを選択した。", "                            choose %s personality."), sex_info[p_ptr->psex].title);
        do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
 
-#ifdef JP
-       sprintf(buf,"                            種族に%sを選択した。", race_info[p_ptr->prace].title);
-#else
-       sprintf(buf,"                            choose %s race.", race_info[p_ptr->prace].title);
-#endif
+       sprintf(buf,_("                            種族に%sを選択した。", "                            choose %s race."), race_info[p_ptr->prace].title);
        do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
 
-#ifdef JP
-       sprintf(buf,"                            職業に%sを選択した。", class_info[p_ptr->pclass].title);
-#else
-       sprintf(buf,"                            choose %s class.", class_info[p_ptr->pclass].title);
-#endif
+       sprintf(buf,_("                            職業に%sを選択した。", "                            choose %s class."), class_info[p_ptr->pclass].title);
        do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
 
        if (p_ptr->realm1)
        {
-#ifdef JP
-               sprintf(buf,"                            魔法の領域に%s%sを選択した。",realm_names[p_ptr->realm1], p_ptr->realm2 ? format("と%s",realm_names[p_ptr->realm2]) : "");
-#else
-               sprintf(buf,"                            choose %s%s realm.",realm_names[p_ptr->realm1], p_ptr->realm2 ? format(" realm and %s",realm_names[p_ptr->realm2]) : "");
-#endif
+               sprintf(buf,_("                            魔法の領域に%s%sを選択した。", "                            choose %s%s realm."),realm_names[p_ptr->realm1], p_ptr->realm2 ? format("と%s",realm_names[p_ptr->realm2]) : "");
                do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
        }
 
-#ifdef JP
-       sprintf(buf,"                            性格に%sを選択した。", seikaku_info[p_ptr->pseikaku].title);
-#else
-       sprintf(buf,"                            choose %s.", seikaku_info[p_ptr->pseikaku].title);
-#endif
+       sprintf(buf,_("                            性格に%sを選択した。", "                            choose %s."), seikaku_info[p_ptr->pseikaku].title);
        do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
 
        /* Init the shops */

diff --git a/src/xtra2.c b/src/xtra2.c
index c10750e..6950970 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -3116,11 +3116,7 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                    (have_flag(f_ptr->flags, FF_BLDG) && !p_ptr->inside_arena) ||
                    have_flag(f_ptr->flags, FF_ENTRANCE))
                {
-#ifdef JP
-                       s2 = "の入口";
-#else
-                       s3 = "";
-#endif
+                       s2 = _("の入口", "");
                }
 #ifndef JP
                else if (have_flag(f_ptr->flags, FF_FLOOR) ||
@@ -3215,19 +3211,19 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
  */
 bool target_set(BIT_FLAGS mode)
 {
-       int             i, d, m, t, bd;
+       int i, d, m, t, bd;
        POSITION y = p_ptr->y;
        POSITION x = p_ptr->x;
 
-       bool    done = FALSE;
-       bool    flag = TRUE;
-       char    query;
-       char    info[80];
-       char    same_key;
+       bool done = FALSE;
+       bool flag = TRUE;
+       char query;
+       char info[80];
+       char same_key;
 
-       cave_type               *c_ptr;
+       cave_type *c_ptr;
 
-       int wid, hgt;
+       TERM_LEN wid, hgt;
        
        get_screen_size(&wid, &hgt);
 
@@ -3286,8 +3282,7 @@ bool target_set(BIT_FLAGS mode)
                        {
                                char cheatinfo[30];
                                sprintf(cheatinfo, " LOS:%d, PROJECTABLE:%d",
-                                       los(p_ptr->y, p_ptr->x, y, x),
-                                       projectable(p_ptr->y, p_ptr->x, y, x));
+                                       los(p_ptr->y, p_ptr->x, y, x), projectable(p_ptr->y, p_ptr->x, y, x));
                                strcat(info, cheatinfo);
                        }