- オプション名confirm_wear の変数名が wear_confirm だったので、オプション名に合わせた。

[hengband/hengband.git] / src / tables.c

diff --git a/src/tables.c b/src/tables.c
index 356e55a..9158812 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -6384,10 +6384,10 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &wear_confirm,                TRUE, 1, 5, 4,
+       { &confirm_wear,                TRUE, 1, 5, 4,
        "confirm_wear",                 "¼ö¤ï¤ì¤¿Êª¤òÁõÈ÷¤¹¤ë»þ³Îǧ¤¹¤ë" },
 #else
-       { &wear_confirm,                TRUE, 1, 5, 4,
+       { &confirm_wear,                TRUE, 1, 5, 4,
        "confirm_wear",                 "Confirm to wear/wield known cursed items" },
 #endif
 
@@ -6402,10 +6402,10 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &target_pet,                  TRUE,  1, 2, 5,
+       { &target_pet,                  FALSE,  1, 2, 5,
         "target_pet",                   "¥Ú¥Ã¥È¤ò¥¿¡¼¥²¥Ã¥È¤Ë¤¹¤ë" },
 #else
-       { &target_pet,                  TRUE,  1, 2, 5,
+       { &target_pet,                  FALSE,  1, 2, 5,
        "target_pet",                   "Allow targetting pets" },
 #endif
 
@@ -6633,11 +6633,11 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &old_way_of_kaz,              TRUE,  2, 4, 5,
-        "old_way_of_kaz",               "¥¢¥¤¥Æ¥à¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¿ô¤¨Êý¤òÊѤ¨¤ë" },
+       { &change_numeral,              TRUE,  2, 4, 5,
+        "change_numeral",               "¥¢¥¤¥Æ¥à¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¿ô¤¨Êý¤òÊѤ¨¤ë" },
 #else
-       { &old_way_of_kaz,              TRUE,  99, 4, 5,
-        "old_way_of_kaz",               "Change a way to counting (japanese only)" },
+       { &change_numeral,              TRUE,  99, 4, 5,
+        "change_numeral",               "Change a way to counting (japanese only)" },
 #endif
 
 
@@ -6648,7 +6648,7 @@ option_type option_info[] =
         "manual_haggle",                "Ź¤ÇÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë" },
 #else
        { &manual_haggle,               FALSE, 3, 1, 0,
-       "manual_haggle",                "Manualy haggle in stores" },
+       "manual_haggle",                "Manually haggle in stores" },
 #endif
 
 
@@ -6761,10 +6761,10 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &last_words,                  FALSE, 3, 0, 28,
+       { &last_words,                  TRUE, 3, 0, 28,
        "last_words",                   "¥­¥ã¥é¥¯¥¿¡¼¤¬»à¤ó¤À»þ°ä¸À¤ò¤Î¤³¤¹" },
 #else
-       { &last_words,                  FALSE, 3, 0, 28,
+       { &last_words,                  TRUE, 3, 0, 28,
        "last_words",                   "Leave last words when your character dies" },
 #endif
 
@@ -6819,10 +6819,10 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &disturb_move,                TRUE,  4, 0, 20,
+       { &disturb_move,                FALSE,  4, 0, 20,
         "disturb_move",                 "¤É¤³¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
 #else
-       { &disturb_move,                TRUE,  4, 0, 20,
+       { &disturb_move,                FALSE,  4, 0, 20,
        "disturb_move",                 "Disturb whenever any monster moves" },
 #endif
 
@@ -6882,14 +6882,23 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &alert_hitpoint,              FALSE, 4, 0, 26,
+       { &alert_hitpoint,              TRUE, 4, 0, 26,
         "alert_hitpoint",               "Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤Î·Ù¹ð»þ¤Ë¥Ó¡¼¥×¤òÌĤ餹" },
 #else
-       { &alert_hitpoint,              FALSE, 4, 0, 26,
+       { &alert_hitpoint,              TRUE, 4, 0, 26,
        "alert_hitpoint",               "Alert user to critical hitpoints" },
 #endif
 
 
+#ifdef JP
+       { &disturb_trap_detect,         FALSE, 4, 0, 27,
+        "disturb_trap_detect",          "¥È¥é¥Ã¥×´¶ÃÎÈϰϳ°¤Ë½Ð¤¿¤È¤­¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+#else
+       { &disturb_trap_detect,         FALSE, 4, 0, 27,
+       "disturb_trap_detect",          "Disturb when leaving last trap detect area"},
+#endif
+
+
        /*** Efficiency ***/
 
 #ifdef JP
@@ -6911,11 +6920,11 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &avoid_abort,                 TRUE,  5, 1, 18,
-        "avoid_abort",                  "Ϣ³¥³¥Þ¥ó¥É¤Ï¥­¡¼ÆþÎϤÇÃæÃǤ¹¤ë" },
+       { &check_abort,                 TRUE,  5, 1, 18,
+        "check_abort",                  "Ϣ³¥³¥Þ¥ó¥É¤Ï¥­¡¼ÆþÎϤÇÃæÃǤ¹¤ë" },
 #else
-       { &avoid_abort,                 TRUE,  5, 1, 18,
-       "avoid_abort",                  "Check for user abort while continuous command" },
+       { &check_abort,                 TRUE,  5, 1, 18,
+       "check_abort",                  "Check for user abort while continuous command" },
 #endif
 
 
@@ -7151,7 +7160,7 @@ option_type option_info[] =
         "autochara",                   "ÂγÊ/Ãϰ̤˥ª¡¼¥È¥í¡¼¥é¡¼»ÈÍÑ" },
 #else
        { &autochara,                   FALSE, 6, 6, 16,
-       "autochara",                    "Autorole for weight, height and social status" },
+       "autochara",                    "Autoroll for weight, height and social status" },
 #endif
 
 
@@ -7176,10 +7185,10 @@ option_type option_info[] =
 #endif
 
 #ifdef JP
-        { &leave_worth,                 FALSE, 7, 7, 2,
+        { &leave_worth,                 TRUE, 7, 7, 2,
         "leave_worth",                  "²ÁÃͤ¬¤¢¤ë¥¢¥¤¥Æ¥à¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_worth,                 FALSE, 7, 7, 2,
+        { &leave_worth,                 TRUE, 7, 7, 2,
         "leave_worth",                  "Auto-destroyer leaves known worthy items" },
 #endif
 
@@ -7192,18 +7201,18 @@ option_type option_info[] =
 #endif
 
 #ifdef JP
-        { &leave_chest,                 FALSE, 7, 7, 7,
+        { &leave_chest,                 TRUE, 7, 7, 7,
         "leave_chest",                  "³«Éõ¤µ¤ì¤Æ¤¤¤Ê¤¤È¢¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_chest,                 FALSE, 7, 7, 7,
+        { &leave_chest,                 TRUE, 7, 7, 7,
         "leave_chest",                  "Auto-destroyer leaves closed chests" },
 #endif
 
 #ifdef JP
-        { &leave_wanted,                FALSE, 7, 7, 4,
+        { &leave_wanted,                TRUE, 7, 7, 4,
         "leave_wanted",                 "¾Þ¶â¼ó¤Î»àÂÎ/¹ü¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_wanted,                FALSE, 7, 7, 4,
+        { &leave_wanted,                TRUE, 7, 7, 4,
         "leave_wanted",                 "Auto-destroyer leaves wanted corpses" },
 #endif
 
@@ -7220,7 +7229,7 @@ option_type option_info[] =
         "leave_junk",                   "¤¬¤é¤¯¤¿¤Ï²õ¤µ¤Ê¤¤" },
 #else
         { &leave_junk,                  FALSE, 7, 7, 6,
-        "leave_junk",                   "Auto-destroyer leaves junks" },
+        "leave_junk",                   "Auto-destroyer leaves junk" },
 #endif
 
 
@@ -7327,7 +7336,7 @@ option_type option_info[] =
         "record_named_pet",             "̾Á°¤Ä¤­¥Ú¥Ã¥È¤Î¾ðÊó¤òµ­Ï¿¤¹¤ë" },
 #else
         { &record_named_pet,            FALSE, 10, 4, 23,
-        "record_named_pet",             "Record infomations of named pets" },
+        "record_named_pet",             "Record informations of named pets" },
 #endif