pref-optのオプションのデフォルト設定の並びをちゃんと変愚に合せた。

pref-optで抜けていたオプションいくつかもちゃんと補完。
table.cのデフォルトと食いちがっていた設定は一致させて、一部table.cの方を変えた。

diff --git a/lib/pref/pref-opt.prf b/lib/pref/pref-opt.prf
index 6d4c029..33aa74b 100644 (file)
--- a/lib/pref/pref-opt.prf
+++ b/lib/pref/pref-opt.prf
@@ -9,59 +9,83 @@
 #
 
 
-##### User-Interface #####
+##### Input Options #####
 
 X:rogue_like_commands
+X:always_pickup
+X:carry_query_flag
 Y:quick_messages
 X:auto_more
 Y:command_menu
-Y:other_query_flag
-Y:carry_query_flag
+X:other_query_flag
 X:use_old_target
-Y:always_pickup
 Y:always_repeat
+X:confirm_destroy
+Y:wear_confirm
+X:confirm_stairs
+Y:target_pet
+Y:easy_open
+Y:easy_disarm
+X:easy_floor
+X:use_command
+X:over_exert
+
+##### Output Options #####
+
 X:depth_in_feet
 Y:show_labels
 Y:show_weights
 Y:show_item_graph
 Y:show_choices
-X:ring_bell
 X:plain_pickup
-Y:old_way_of_kaz
+X:player_symbols
+Y:equippy_chars
+X:skip_mutations
+Y:plain_descriptions
+X:center_player
+Y:center_running
+Y:view_yellow_lite
+Y:view_bright_lite
+Y:view_granite_lite
+Y:view_special_lite
+X:new_ascii_graphics
 X:display_path
+Y:always_show_list
+Y:old_way_of_kaz
 
+##### Game-Play #####
+
+X:manual_haggle
+X:auto_scum
+Y:stack_force_notes
+X:stack_force_costs
+Y:stack_allow_items
+Y:expand_look
+Y:expand_list
+Y:view_perma_grids
+X:view_torch_grids
+Y:dungeon_stair
+Y:small_levels
+X:always_small_levels
+Y:empty_levels
+Y:last_words
+Y:send_score
 
 ##### Disturbance #####
 
 X:find_ignore_stairs
 Y:find_ignore_doors
-Y:find_cut
+X:find_cut
 Y:find_examine
 X:disturb_move
 Y:disturb_near
 X:disturb_pets
 Y:disturb_panel
+Y:disturb_state
 Y:disturb_minor
+X:ring_bell
 Y:alert_hitpoint
-
-
-##### Game-Play #####
-
-Y:manual_haggle
-X:auto_scum
-X:stack_force_notes
-X:stack_force_costs
-Y:stack_allow_items
-Y:expand_look
-Y:expand_list
-Y:view_perma_grids
-X:view_torch_grids
-Y:dungeon_stair
-Y:smart_learn
-X:smart_cheat
-Y:target_pet
-X:easy_band
-
+X:disturb_trap_detect
 
 ##### Efficiency #####
 
@@ -75,62 +99,32 @@ X:fresh_after
 X:fresh_message
 X:compress_savefile
 Y:hilite_player
-Y:view_yellow_lite
-Y:view_bright_lite
-Y:view_granite_lite
-Y:view_special_lite
-X:new_ascii_graphics
-
 
-##### ZAngband options #####
+##### Birth Options #####
 
-Y:last_words
-Y:small_levels
-X:always_small_levels
-Y:empty_levels
-X:player_symbols
-Y:equippy_chars
-X:skip_mutations
-X:plain_descriptions
+X:easy_band
+Y:smart_learn
+X:smart_cheat
 X:stupid_monsters
-X:confirm_destroy
-Y:confirm_wear
-X:confirm_stairs
-X:easy_open
-X:easy_disarm
-X:easy_floor
-X:use_command
-X:center_player
-Y:center_running
-
-
-##### Birth #####
-
 X:vanilla_town
 X:lite_town
-Y:terrain_streams
-Y:preserve_mode
-Y:autoroller
-X:autochara
-X:left_hander
-
-##### Ironman #####
-
 X:ironman_shops
 X:ironman_small_levels
 X:ironman_downward
 X:ironman_autoscum
 X:ironman_empty_levels
+Y:terrain_streams
+X:munchkin_death
 X:ironman_rooms
 X:ironman_nightmare
+X:left_hander
+Y:preserve_mode
+Y:autoroller
+X:autochara
+Y:powerup_home
 
+##### Easy Object Auto-Destroyer #####
 
-##### Silly #####
-
-X:munchkin_death
-
-
-##### Easy auto-destroyer #####
 X:destroy_items
 Y:leave_worth
 X:leave_equip
@@ -139,17 +133,18 @@ Y:leave_wanted
 X:leave_corpse
 X:leave_junk
 
-##### nikki #####
+##### Play-record Options #####
+
 Y:record_fix_art
 Y:record_rand_art
 Y:record_destroy_uniq
-Y:record_maxdeapth
 Y:record_fix_quest
 Y:record_rand_quest
+Y:record_maxdeapth
 Y:record_stair
 Y:record_buy
 X:record_sell
 Y:record_danger
 Y:record_arena
 Y:record_ident
-
+X:record_named_pet

diff --git a/src/tables.c b/src/tables.c
index 24e3e49..d6eb3e2 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -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,10 +6882,10 @@ 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
 
@@ -7185,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
 
@@ -7201,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