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

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 8fedc95..ae3e71f 100644 (file)
--- 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 */
        p_ptr->energy_use = 50;
 
        /* Take off the item */


@@ -611,8 +610,6 @@ void do_cmd_drop(void)
                if (amt <= 0) return;
        }
 
                if (amt <= 0) return;
        }
 

-
-       /* Take a partial turn */

        p_ptr->energy_use = 50;
 
        /* Drop (some of) the item */
        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;
 static void do_cmd_refill_lamp(void)
 {
        OBJECT_IDX item;

-

        object_type *o_ptr;
        object_type *j_ptr;
        object_type *o_ptr;
        object_type *j_ptr;

-

        concptr q, s;
 
        /* Restrict the choices */
        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;
 
        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 */
        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;
 
        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 */
        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))
                {
                /* Describe the location */
                if ((y2 == y1) && (x2 == x1))
                {

-#ifdef JP
-                       strcpy(tmp_val, "真上");
-#else
-                       tmp_val[0] = '\0';
-#endif
-
+                       strcpy(tmp_val, _("真上", "\0"));

                }
                else
                {
                }
                else
                {

-#ifdef JP

                        sprintf(tmp_val, "%s%s",
                        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 */
                }
 
                /* Prepare to ask which way to look */