easy_* use_command over_exert オプションの位置をキー入力オプションに変更。

diff --git a/src/tables.c b/src/tables.c
index 1681931..124d8e4 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -6410,6 +6410,57 @@ option_type option_info[] =
 #endif
 
 
+#ifdef ALLOW_EASY_OPEN
+#ifdef JP
+       { &easy_open,                   TRUE,  1, 5, 7,
+       "easy_open",                    "¼«Æ°Åª¤Ë¥É¥¢¤ò³«¤±¤ë" },
+#else
+       { &easy_open,                   TRUE,  1, 5, 7,
+       "easy_open",                    "Automatically open doors" },
+#endif
+#endif /* ALLOW_EASY_OPEN */
+
+
+#ifdef ALLOW_EASY_DISARM
+#ifdef JP
+       { &easy_disarm,                 TRUE,  1, 5, 8,
+       "easy_disarm",                  "¼«Æ°Åª¤Ë櫤ò²ò½ü¤¹¤ë" },
+#else
+       { &easy_disarm,                 TRUE,  1, 5, 8,
+       "easy_disarm",                  "Automatically disarm traps" },
+#endif
+#endif /* ALLOW_EASY_DISARM */
+
+
+#ifdef ALLOW_EASY_FLOOR /* TNB */
+#ifdef JP
+       { &easy_floor,                  FALSE, 1, 5, 9,
+       "easy_floor",                   "¾²¾å¤Ç½Å¤Ê¤Ã¤¿¥¢¥¤¥Æ¥à¤ò¥ê¥¹¥È¤¹¤ë" },
+#else
+       { &easy_floor,                  FALSE, 1, 5, 9,
+       "easy_floor",                   "Display floor stacks in a list" },
+#endif
+#endif /* ALLOW_EASY_FLOOR -- TNB */
+
+
+#ifdef JP
+       { &use_command,                 FALSE, 1, 5, 10,
+       "use_command",                  "¡Ö»È¤¦(a)¡×¥³¥Þ¥ó¥É¤Ç¥¢¥¤¥Æ¥à¤ò²¿¤Ç¤â»È¤¨¤ë" },
+#else
+       { &use_command,                 FALSE, 1, 5, 10,
+       "use_command",                  "Allow unified use command" },
+#endif
+
+
+#ifdef JP
+       { &over_exert,                  TRUE,  1, 0, 29,
+       "over_exert",                   "MP¤¬Â­¤ê¤Ê¤¯¤Æ¤âËâË¡¤ËÄ©À魯¤ë" },
+#else
+       { &over_exert,                  TRUE,  1, 0, 29,
+       "over_exert",                   "Allow casting spells when short of mana" },
+#endif
+
+
        /*** Output Options ***/
 
 #ifdef JP
@@ -6718,48 +6769,6 @@ option_type option_info[] =
 #endif
 
 
-#ifdef ALLOW_EASY_OPEN
-#ifdef JP
-       { &easy_open,                   TRUE,  3, 5, 7,
-       "easy_open",                    "¼«Æ°Åª¤Ë¥É¥¢¤ò³«¤±¤ë" },
-#else
-       { &easy_open,                   TRUE,  3, 5, 7,
-       "easy_open",                    "Automatically open doors" },
-#endif
-#endif /* ALLOW_EASY_OPEN */
-
-
-#ifdef ALLOW_EASY_DISARM
-#ifdef JP
-       { &easy_disarm,                 TRUE,  3, 5, 8,
-       "easy_disarm",                  "¼«Æ°Åª¤Ë櫤ò²ò½ü¤¹¤ë" },
-#else
-       { &easy_disarm,                 TRUE,  3, 5, 8,
-       "easy_disarm",                  "Automatically disarm traps" },
-#endif
-#endif /* ALLOW_EASY_DISARM */
-
-
-#ifdef ALLOW_EASY_FLOOR /* TNB */
-#ifdef JP
-       { &easy_floor,                  FALSE, 3, 5, 9,
-       "easy_floor",                   "¾²¾å¤Ç½Å¤Ê¤Ã¤¿¥¢¥¤¥Æ¥à¤ò¥ê¥¹¥È¤¹¤ë" },
-#else
-       { &easy_floor,                  FALSE, 3, 5, 9,
-       "easy_floor",                   "Display floor stacks in a list" },
-#endif
-#endif /* ALLOW_EASY_FLOOR -- TNB */
-
-
-#ifdef JP
-       { &use_command,                 FALSE, 3, 5, 10,
-       "use_command",                  "¡Ö»È¤¦(a)¡×¥³¥Þ¥ó¥É¤Ç¥¢¥¤¥Æ¥à¤ò²¿¤Ç¤â»È¤¨¤ë" },
-#else
-       { &use_command,                 FALSE, 3, 5, 10,
-       "use_command",                  "Allow unified use command" },
-#endif
-
-
 #ifdef JP
        { &last_words,                  FALSE, 3, 0, 28,
        "last_words",                   "¥­¥ã¥é¥¯¥¿¡¼¤¬»à¤ó¤À»þ°ä¸À¤ò¤Î¤³¤¹" },
@@ -6769,15 +6778,6 @@ option_type option_info[] =
 #endif
 
 
-#ifdef JP
-       { &over_exert,                  TRUE,  3, 0, 29,
-       "over_exert",                   "MP¤¬Â­¤ê¤Ê¤¯¤Æ¤âËâË¡¤ËÄ©À魯¤ë" },
-#else
-       { &over_exert,                  TRUE,  3, 0, 29,
-       "over_exert",                   "Allow casting spells when short of mana" },
-#endif
-
-
 #ifdef WORLD_SCORE
 #ifdef JP
        { &send_score,                  TRUE,  3, 4, 6,