初期オプションを参照専用で見ている場合は変更キーの説明を出さないよう

にし, 'y' 'n' キーでは反応しないように変更. また, "Startup" ->
"Birth" と変更.

diff --git a/src/cmd4.c b/src/cmd4.c
index 09bf8d1..2a8ea95 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -1902,7 +1902,7 @@ static void do_cmd_options_autosave(cptr info)
 }
 
 
-#define PAGE_STARTUP     6
+#define PAGE_BIRTH       6
 #define PAGE_AUTODESTROY 7
 
 /*
@@ -1914,7 +1914,7 @@ void do_cmd_options_aux(int page, cptr info)
        int     i, k = 0, n = 0, l;
        int     opt[24];
        char    buf[80];
-       bool    browse_only = (page == PAGE_STARTUP) && character_generated &&
+       bool    browse_only = (page == PAGE_BIRTH) && character_generated &&
                              (!p_ptr->wizard || !allow_debug_opts);
 
 
@@ -1939,9 +1939,9 @@ void do_cmd_options_aux(int page, cptr info)
 
                /* Prompt XXX XXX XXX */
 #ifdef JP
-               sprintf(buf, "%s (¥ê¥¿¡¼¥ó:¼¡, y/n:Êѹ¹, ESC:½ªÎ», ?:¥Ø¥ë¥×) ", info);
+               sprintf(buf, "%s (¥ê¥¿¡¼¥ó:¼¡, %sESC:½ªÎ», ?:¥Ø¥ë¥×) ", info, browse_only ? "" : "y/n:Êѹ¹, ");
 #else
-               sprintf(buf, "%s (RET:next, y/n:change, ESC:accept, ?:help) ", info);
+               sprintf(buf, "%s (RET:next, %s, ?:help) ", info, browse_only ? "ESC:exit" : "y/n:change, ESC:accept");
 #endif
 
                prt(buf, 0, 0);
@@ -2021,7 +2021,8 @@ void do_cmd_options_aux(int page, cptr info)
                        case 'Y':
                        case '6':
                        {
-                               if (!browse_only) (*option_info[opt[k]].o_var) = TRUE;
+                               if (browse_only) break;
+                               (*option_info[opt[k]].o_var) = TRUE;
                                k = (k + 1) % n;
                                break;
                        }
@@ -2030,7 +2031,8 @@ void do_cmd_options_aux(int page, cptr info)
                        case 'N':
                        case '4':
                        {
-                               if (!browse_only) (*option_info[opt[k]].o_var) = FALSE;
+                               if (browse_only) break;
+                               (*option_info[opt[k]].o_var) = FALSE;
                                k = (k + 1) % n;
                                break;
                        }
@@ -2327,20 +2329,20 @@ void do_cmd_options(void)
 
                if (!p_ptr->wizard || !allow_debug_opts)
                {
-                       /* Startup */
+                       /* Birth */
 #ifdef JP
-                       prt("(S)       ½é´ü            ¥ª¥×¥·¥ç¥ó (»²¾È¤Î¤ß)", 16, 5);
+                       prt("(B)       ½é´ü            ¥ª¥×¥·¥ç¥ó (»²¾È¤Î¤ß)", 16, 5);
 #else
-                       prt("(S) Startup Options (Browse Only)", 16, 5);
+                       prt("(B) Birth Options (Browse Only)", 16, 5);
 #endif
                }
                else
                {
-                       /* Startup */
+                       /* Birth */
 #ifdef JP
-                       prt("(S)       ½é´ü            ¥ª¥×¥·¥ç¥ó", 16, 5);
+                       prt("(B)       ½é´ü            ¥ª¥×¥·¥ç¥ó", 16, 5);
 #else
-                       prt("(S) Startup Options", 16, 5);
+                       prt("(B) Birth Options", 16, 5);
 #endif
                }
 
@@ -2458,20 +2460,20 @@ void do_cmd_options(void)
 #ifdef JP
                                do_cmd_options_aux(10, "¥×¥ì¥¤µ­Ï¿¥ª¥×¥·¥ç¥ó");
 #else
-                               do_cmd_options_aux(10, "Play-record Option");
+                               do_cmd_options_aux(10, "Play-record Options");
 #endif
                                break;
                        }
 
-                       /* Startup Options */
-                       case 'S':
-                       case 's':
+                       /* Birth Options */
+                       case 'B':
+                       case 'b':
                        {
                                /* Spawn */
 #ifdef JP
                                do_cmd_options_aux(6, (!p_ptr->wizard || !allow_debug_opts) ? "½é´ü¥ª¥×¥·¥ç¥ó(»²¾È¤Î¤ß)" : "½é´ü¥ª¥×¥·¥ç¥ó((*)¤Ï¥¹¥³¥¢¤Ë±Æ¶Á)");
 #else
-                               do_cmd_options_aux(6, (!p_ptr->wizard || !allow_debug_opts) ? "Startup Opts(browse only)" : "Startup Opts((*)s effect score)");
+                               do_cmd_options_aux(6, (!p_ptr->wizard || !allow_debug_opts) ? "Birth Options(browse only)" : "Birth Options((*)s effect score)");
 #endif
 
                                break;