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

- 否定形のオプション名をちゃんと修正
  avoid_abort → check_abort、old_way_of_kaz → change_numeral
- target_petはデフォルトでoffに修正。

diff --git a/lib/help/joption.txt b/lib/help/joption.txt
index c58aae9..cc507d5 100644 (file)
--- a/lib/help/joption.txt
+++ b/lib/help/joption.txt
@@ -256,7 +256,7 @@ MP
     ¤Þ¤¹¤¬¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤¹¤ë¤ÈºÇ½é¤«¤é¥ê¥¹¥È¤¬É½¼¨¤µ¤ì¤ë¤è¤¦
     ¤Ë¤Ê¤ê¤Þ¤¹¡£
 
-¥¢¥¤¥Æ¥à¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¿ô¤¨Êý¤òÊѤ¨¤ë  [old_way_of_kaz]
+¥¢¥¤¥Æ¥à¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¿ô¤¨Êý¤òÊѤ¨¤ë  [change_numeral]
     2ËܤÎÌð¡¢3ºý¤ÎËâË¡½ñÅù¤ÎÍͤˡ¢¥¢¥¤¥Æ¥à¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¿ô¤¨Êý¤òÊѤ¨¤Þ
     ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò̵¸ú¤Ë¤¹¤ë¤ÈÁ´¤Æ¤Î¥¢¥¤¥Æ¥à¤Ï 1¤Ä¡¢¡Ä¡¢9¤Ä¡¢10
     ¸Ä¤Î¤è¤¦¤Ë¿ô¤¨¤Þ¤¹¡£
@@ -434,7 +434,7 @@ MP
     ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¡¢¤¢¤ëÄøÅÙÎ¥¤ì¤¿À¸Êª¤ò̵»ë¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£³¹¤Ë
     ¤Ï±óµ÷Î¥¹¶·â¤ò»Å³Ý¤±¤Æ¤¯¤ëŨ¤Ï¤¤¤Ê¤¤¤Î¤Ç¡¢Ä̾ï¤Ï¤³¤ì¤Ç¤â°ÂÁ´¤Ç¤¹¡£
 
-Ϣ³¥³¥Þ¥ó¥É¤Ï¥­¡¼ÆþÎϤÇÃæÃǤ¹¤ë  [avoid_abort]
+Ϣ³¥³¥Þ¥ó¥É¤Ï¥­¡¼ÆþÎϤÇÃæÃǤ¹¤ë  [check_abort]
     µÙ©¡¢Áö¤ë¡¢¤½¤Î¾·«¤êÊÖ¤·¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¡¢¥­¡¼ÆþÎϤδƻë¤ò»ß¤á¤Þ
     ¤¹¡£¤³¤ì¤Ï¥²¡¼¥à¤ò¡Ê¿¤¯¤Î¥·¥¹¥Æ¥à¾å¤Ç¡Ë¤«¤Ê¤êǽΨŪ¤Ë¤¹¤ë¤À¤±¤Ç¤Ê
     ¤¯¡¢Î㤨¤Ð¡Ö¤³¤Î¥ª¥×¥·¥ç¥ó¤òON -> Á´²óÉü¤¹¤ë¤Þ¤ÇµÙ© -> ¤³¤Î¥ª¥×¥·

diff --git a/lib/help/option.txt b/lib/help/option.txt
index d4267d9..d1c8f98 100644 (file)
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -408,7 +408,7 @@ Reduce view-radius in town    [view_reduce_view]
     player to ignore monsters in town which are more than ten grids
     away, which is usually safe, since none have distance attacks.
 
-Check for user abort while continuous command    [avoid_abort]
+Check for user abort while continuous command    [check_abort]
     Avoid checking to see if the user has pressed a key during resting
     or running or repeated commands.  This not only makes the game much
     more efficient (on many systems), but also allows the use of

diff --git a/lib/pref/pref-opt.prf b/lib/pref/pref-opt.prf
index 33aa74b..0e40f37 100644 (file)
--- a/lib/pref/pref-opt.prf
+++ b/lib/pref/pref-opt.prf
@@ -21,9 +21,9 @@ X:other_query_flag
 X:use_old_target
 Y:always_repeat
 X:confirm_destroy
-Y:wear_confirm
+Y:confirm_wear
 X:confirm_stairs
-Y:target_pet
+X:target_pet
 Y:easy_open
 Y:easy_disarm
 X:easy_floor
@@ -51,7 +51,7 @@ Y:view_special_lite
 X:new_ascii_graphics
 X:display_path
 Y:always_show_list
-Y:old_way_of_kaz
+Y:change_numeral
 
 ##### Game-Play #####
 
@@ -91,7 +91,7 @@ X:disturb_trap_detect
 
 X:view_reduce_lite
 X:view_reduce_view
-Y:avoid_abort
+Y:check_abort
 Y:flush_failure
 X:flush_disturb
 Y:fresh_before

diff --git a/src/cmd3.c b/src/cmd3.c
index de300a0..533c720 100644 (file)
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -385,7 +385,7 @@ s = "
                return;
        }
 
-       if (cursed_p(o_ptr) && wear_confirm &&
+       if (cursed_p(o_ptr) && confirm_wear &&
            (object_known_p(o_ptr) || (o_ptr->ident & IDENT_SENSE)))
        {
                char dummy[MAX_NLEN+80];

diff --git a/src/dungeon.c b/src/dungeon.c
index f188c08..bd7c9a6 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -5040,7 +5040,7 @@ msg_print("
        }
 
        /* Handle "abort" */
-       if (avoid_abort)
+       if (check_abort)
        {
                /* Check for "player abort" (semi-efficiently for resting) */
                if (running || command_rep || (p_ptr->action == ACTION_REST) || (p_ptr->action == ACTION_FISH))

diff --git a/src/externs.h b/src/externs.h
index f3e2d87..35f4783 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -225,7 +225,7 @@ extern bool disturb_move;
 extern bool disturb_panel;
 extern bool disturb_state;
 extern bool disturb_minor;
-extern bool avoid_abort;
+extern bool check_abort;
 extern bool avoid_other;
 extern bool flush_disturb;
 extern bool flush_failure;
@@ -245,14 +245,14 @@ extern bool plain_pickup;
 
 extern bool always_show_list;
 extern bool powerup_home;
-extern bool old_way_of_kaz;
+extern bool change_numeral;
 extern bool send_score;
 
 extern bool skip_mutations;     /* Skip mutations screen in 'C'haracter display */
 extern bool plain_descriptions;
 extern bool stupid_monsters;
 extern bool confirm_destroy;
-extern bool wear_confirm;
+extern bool confirm_wear;
 extern bool confirm_stairs;
 extern bool disturb_pets;
 extern bool view_perma_grids;

diff --git a/src/flavor.c b/src/flavor.c
index f8a20cc..92823f8 100644 (file)
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -1639,7 +1639,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
        }
        else if (o_ptr->number > 1)
        {
-               if ( old_way_of_kaz == FALSE ){
+               if ( change_numeral == FALSE ){
                        t = object_desc_num(t, o_ptr->number);
                        if (o_ptr->number > 9)
                                t = object_desc_str(t, "¸Ä¤Î ");

diff --git a/src/tables.c b/src/tables.c
index d6eb3e2..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
 
 
@@ -6920,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
 
 

diff --git a/src/variable.c b/src/variable.c
index fa6d562..fcc95fa 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -250,7 +250,7 @@ bool plain_descriptions;    /* Plain object descriptions */
 bool stupid_monsters;          /* Monsters use old AI */
 bool confirm_destroy;          /* Known worthless items are destroyed without confirmation */
 bool confirm_stairs;           /* Prompt before staircases... */
-bool wear_confirm;             /* Confirm before putting on known cursed items */
+bool confirm_wear;             /* Confirm before putting on known cursed items */
 bool disturb_pets;             /* Pets moving nearby disturb us */
 
 
@@ -284,7 +284,7 @@ bool smart_cheat;                   /* Monsters exploit player weaknesses */
 bool view_reduce_lite;         /* Reduce lite-radius when running */
 bool view_reduce_view;         /* Reduce view-radius in town */
 
-bool avoid_abort;                      /* Avoid checking for user abort */
+bool check_abort;                      /* Avoid checking for user abort */
 
 bool flush_failure;                    /* Flush input on any failure */
 bool flush_disturb;                    /* Flush input on disturbance */
@@ -309,7 +309,7 @@ bool plain_pickup;
 
 bool always_show_list;
 bool powerup_home;
-bool old_way_of_kaz;
+bool change_numeral;
 bool send_score;
 
 /* Cheating options */