OSDN Git Service

Magic eater's magic browse command is improved. (Ticket #19143)
authoriks <iks@0568b783-4c39-0410-ac80-bf13821ea2a2>
Sun, 3 Feb 2013 05:40:45 +0000 (05:40 +0000)
committeriks <iks@0568b783-4c39-0410-ac80-bf13821ea2a2>
Sun, 3 Feb 2013 05:40:45 +0000 (05:40 +0000)
src/cmd6.c

index 9e9c7a8..7756ae1 100644 (file)
@@ -4648,13 +4648,15 @@ static int select_magic_eater(bool only_browse)
                        prt(format(" %s ¾ó", (menu_line == 1) ? "¡Õ" : "  "), 2, 14);
                        prt(format(" %s ËâË¡ËÀ", (menu_line == 2) ? "¡Õ" : "  "), 3, 14);
                        prt(format(" %s ¥í¥Ã¥É", (menu_line == 3) ? "¡Õ" : "  "), 4, 14);
-                       prt("¤É¤Î¼ïÎà¤ÎËâË¡¤ò»È¤¤¤Þ¤¹¤«¡©", 0, 0);
 #else
                        prt(format(" %s staff", (menu_line == 1) ? "> " : "  "), 2, 14);
                        prt(format(" %s wand", (menu_line == 2) ? "> " : "  "), 3, 14);
                        prt(format(" %s rod", (menu_line == 3) ? "> " : "  "), 4, 14);
-                       prt("Which type of magic do you use?", 0, 0);
 #endif
+
+                       if (only_browse) prt(_("¤É¤Î¼ïÎà¤ÎËâË¡¤ò¸«¤Þ¤¹¤«¡©", "Which type of magic do you browse?"), 0, 0);
+                       else prt(_("¤É¤Î¼ïÎà¤ÎËâË¡¤ò»È¤¤¤Þ¤¹¤«¡©", "Which type of magic do you use?"), 0, 0);
+
                        choice = inkey();
                        switch(choice)
                        {
@@ -4740,11 +4742,10 @@ static int select_magic_eater(bool only_browse)
        flag = FALSE;
 
        /* Build a prompt */
-#ifdef JP
-(void) strnfmt(out_val, 78, "('*'¤Ç°ìÍ÷, ESC¤ÇÃæÃÇ) ¤É¤ÎËâÎϤò»È¤¤¤Þ¤¹¤«¡©");
-#else
-       (void)strnfmt(out_val, 78, "(*=List, ESC=exit) Use which power? ");
-#endif
+       if (only_browse) strnfmt(out_val, 78, _("('*'¤Ç°ìÍ÷, ESC¤ÇÃæÃÇ) ¤É¤ÎËâÎϤò¸«¤Þ¤¹¤«¡©",
+                                                                                       "(*=List, ESC=exit) Browse which power? "));
+       else strnfmt(out_val, 78, _("('*'¤Ç°ìÍ÷, ESC¤ÇÃæÃÇ) ¤É¤ÎËâÎϤò»È¤¤¤Þ¤¹¤«¡©",
+                                                               "(*=List, ESC=exit) Use which power? "));
        
        /* Save the screen */
        screen_save();
@@ -5050,13 +5051,7 @@ static int select_magic_eater(bool only_browse)
                                prt(&temp[j], line, 10);
                                line++;
                        }
-       
-#ifdef JP
-                       prt("²¿¤«¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤¡£",0,0);
-#else
-                       prt("Hit any key.",0,0);
-#endif
-                       (void)inkey();
+
                        continue;
                }