From 9602852547ddbf3519609af96aec3c21e2b64857 Mon Sep 17 00:00:00 2001 From: mogami Date: Fri, 29 Aug 2003 13:48:27 +0000 Subject: [PATCH] =?utf8?q?henkma=E3=81=95=E3=82=93=E3=81=A8=E7=9B=B8?= =?utf8?q?=E8=AB=87=E3=81=97=E3=81=A6=E5=90=8C=E6=84=8F=E3=82=92=E5=BE=97?= =?utf8?q?=E3=81=9F=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=AA=E3=83=97=E3=82=B7?= =?utf8?q?=E3=83=A7=E3=83=B3=E3=82=92=E5=89=8A=E9=99=A4=EF=BC=9A=20show=5F?= =?utf8?q?choices,=20player=5Fsymbols,=20stack=5Fallow=5Fitems,=20expand?= =?utf8?q?=5Flook,=20find=5Fexamine,=20alert=5Fhitpoint,=20view=5Freduce?= =?utf8?q?=5Flite=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/help/joption.txt | 40 --------------- lib/help/option.txt | 41 --------------- lib/pref/pref-opt.prf | 7 --- src/cmd1.c | 10 ++-- src/cmd5.c | 20 +++----- src/effects.c | 2 +- src/externs.h | 7 --- src/hissatsu.c | 20 ++++---- src/mane.c | 20 +++----- src/mind.c | 10 ++-- src/mspells3.c | 20 +++----- src/object1.c | 139 +++++++++++++++++++++++--------------------------- src/object2.c | 6 --- src/tables.c | 63 ----------------------- src/variable.c | 8 --- src/xtra1.c | 7 --- src/xtra2.c | 3 -- 17 files changed, 102 insertions(+), 321 deletions(-) diff --git a/lib/help/joption.txt b/lib/help/joption.txt index 53e83e4fe..a6f07497b 100644 --- a/lib/help/joption.txt +++ b/lib/help/joption.txt @@ -195,23 +195,12 @@ MP »ý¤Áʪ¡¢ÁõÈ÷¥ê¥¹¥È¤Ç¾²¤Î¾å¤Ë¤¢¤ë¤È¤­¤ÈƱ¤¸Ê¸»ú¤È¿§¤Ç¥¢¥¤¥Æ¥à¤Î¥·¥ó ¥Ü¥ë¤òɽ¼¨¤·¤Þ¤¹¡£ -***** -»ý¤Áʪ/ÁõÈ÷¥¦¥£¥ó¥É¥¦¤ËÁªÂò¥¢¥¤¥Æ¥àɽ¼¨ [show_choices] - ¥ê¥¹¥È¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¥¦¥¤¥ó¥É¥¦¤Ë²Äǽ¤ÊÁªÂò»è¤òɽ¼¨¤·¤Þ¤¹¡£ - ***** ¡Ö½¦¤Ã¤¿¡×¥á¥Ã¥»¡¼¥¸¤ò´Êά²½¤¹¤ë [plain_pickup] ¥¢¥¤¥Æ¥à¤ò½¦¤Ã¤Æ¼ê»ý¤Á¤Î¥¢¥¤¥Æ¥à¤Ë½Å¤Í¤¿¤È¤­¤Ë¡¢Ä̾ï¤Ï¡Ö3Ëܽ¦¤Ã¤Æ¡¢ 12ËܤÎÌð¤ò»ý¤Ã¤Æ¤¤¤ë¡£¡×Åù¤Î¤è¤¦¤Ë½¦¤Ã¤¿¿ô¤òɽ¼¨¤·¤Þ¤¹¤¬¡¢¤³¤Î¥ª¥× ¥·¥ç¥ó¤òÍ­¸ú¤Ë¤¹¤ë¤È½¦¤Ã¤¿¿ô¤Îɽ¼¨¤ò¾Êά¤¹¤ë¡£ -***** -¥×¥ì¥¤¥ä¡¼¤òÆÃÊ̤ʵ­¹æ¤Çɽ¼¨¤¹¤ë [player_symbols] - ¥­¥ã¥é¥¯¥¿¤ò¤½¤Î¼ï²¡¢¥¯¥é¥¹¡¢À­Ê̤ˤè¤Ã¤Æ°Û¤Ê¤ë¿§¡¢¥·¥ó¥Ü¥ë¤Çɽ¼¨ - ¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ïmain-ibm.c¤ò»ÈÍѤ¹¤ë´Ä¶­¤Ë¤ª¤¤¤Æ¤Î¤ß¥µ¥Ý¡¼ - ¥È¤µ¤ì¤Þ¤¹¤¬¡¢¥¿¥¤¥ë¥°¥é¥Õ¥£¥Ã¥¯¤ò»ÈÍÑÃæ¤Ë¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë´Ø·¸¤Ê - ¤¯¾ï¤Ë°Û¤ë¿§¡¢¥·¥ó¥Ü¥ë¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£ - ***** ¥¹¥Æ¡¼¥¿¥¹¤Ëʸ»ú¤ÇÁõÈ÷¤òɽ¼¨¤¹¤ë [equippy_chars] ¥á¥¤¥ó²èÌ̺¸Ã¼¤Ë¤¢¤Ê¤¿¤ÎÁõÈ÷¤·¤Æ¤¤¤ëÁõÈ÷¤ò¥°¥é¥Õ¥£¥«¥ë¤Ëɽ¸½¤·¤Þ¤¹¡£ @@ -324,17 +313,6 @@ MP Ʊ¤¸¥¢¥¤¥Æ¥à¤Ç¤¢¤ì¤Ð¡¢°ìÊý¤¬°ÂÇä¤ê¤µ¤ì¤Æ¤¤¤¿ÉʤǤ⤦°ìÊý¤¬Ä̾ï¤ÎÉÊ ¤Ç¤¢¤Ã¤Æ¤â½Å¤Í¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¤â¤Ã¤È¤âÂ礭¤Ê³ä°úΨ¤ËÅý°ì¤µ¤ì¤Þ¤¹¡£ -***** -Ʊ¼ï¤ÎÉð´ï¤äËɶñ¤ò¤Þ¤È¤á¤ë [stack_allow_items] - Ʊ°ì¤ÎÉð´ï¤äËɶñ¤ò½Å¤Í¤é¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¤Þ¤¿¡¢¤³¤ì¤ÏƱ°ì¤Ç¤Ï¤¢ - ¤ë¤¬¤Þ¤À¼±Ê̤·¤Æ¤¤¤Ê¤¤Èô¤ÓÆ»¶ñ¤Ë¤âƱÍͤËƯ¤­¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢·ë²Ì¤È - ¤·¤Æ¾¯¡¹¼«Æ°¼±Ê̤Τ褦¤ËƯ¤­¤Þ¤¹¡£ - -***** -¡Ö²ó¤ê¤òÄ´¤Ù¤ë¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë [expand_look] - ¸«¤ë 'l'/'x'¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤·¡¢»ë³¦³°¤Î¥Þ¥¹¤Ç¤âËâˡŪ¤Ê¼êÃʤÇȽÌÀ¤· - ¤Æ¤¤¤ì¤ÐÄ´ºº²Äǽ¤Ë¤·¤Þ¤¹¡£ - ***** ¡Ö°ìÍ÷¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë [expand_list] ¸«¤ë¥³¥Þ¥ó¥É¡¢¥¿¡¼¥²¥Ã¥È¥³¥Þ¥ó¥É¤ä¡¢¥â¥ó¥¹¥¿¡¼¤Î»×¤¤½Ð¥³¥Þ¥ó¥É¤Ç¡¢ @@ -443,12 +421,6 @@ MP ¤Ë¡¢É¬Íפʤé¼Ð¤á¤ËÄ̲ᤷ¤Þ¤¹¡£·ë²Ì¤È¤·¤Æ¡Ö®¤¯¡×Áö¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹ ¤¬¡¢²øʪ¤¬ÂÔ¤ÁÉú¤»¤Æ¤¤¤ëÃæ¤ËÈô¤Ó¹þ¤ó¤Ç¤·¤Þ¤¦¤³¤È¤â¤¢¤ê¤Þ¤¹¡£ -***** -ÄÌÏ©¤¬°Å¤¤»þ¤Ë¤Ê¤ë¤Ù¤¯¶Ê¤ê³Ñ¤È²¾Äꤷ¤ÆÄ̲᤹¤ë [find_examine] - Áö¤Ã¤Æ¤¤¤ë¤È¤­¡¢Ï­²¼¤ÎÀ褬°Å¤¯¤ÆÉô²°¤ÎÆþ¸ý¤«¶Ê¤ê³Ñ¤«È½Ê̤Ǥ­¤Ê¤¤¤È - ¤­¤Ë¡¢¶Ê¤ê³Ñ¤Ç¤¢¤ë»ö¤ò²¾Äꤷ¤ÆÄ̲ᤷ¤Þ¤¹¡£Ä̾ï¤ÏÉô²°¤ÎÆþ¸ý¤Î²ÄǽÀ­ - ¤¬¤¢¤ë¤È¤­¤ÏƧ¤ß¹þ¤Þ¤º¤Ë¼êÁ°¤Ç»ß¤ê¤Þ¤¹¡£ - ***** ¤É¤³¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë [disturb_move] ²øʪ¤¬Æ°¤¤¤¿¤ê¡¢¸½¤ì¤¿¤ê¡¢¾Ã¤¨¤¿¤È¤­¤Ë¹ÔÆ°¤ò¥­¥ã¥ó¥»¥ë¤·¤Þ¤¹¡£¤³¤ì @@ -498,11 +470,6 @@ MP ¥¨¥é¡¼»þ¤Ë¥Ó¡¼¥×²»¤òÌĤ餹 [ring_bell] ²¿¤é¤«¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤È¤­¥Ù¥ë¤òÌĤ餽¤¦¤È¤·¤Þ¤¹¡£ -***** -Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤Î·Ù¹ð»þ¤Ë¥Ó¡¼¥×¤òÌĤ餹 [alert_hitpoint] - HP¤¬'critical point'¡ÊÊ̤ËÀßÄꤷ¤Þ¤¹¡Ë°Ê²¼¤Ë¤Ê¤Ã¤¿¤È¤­¡¢ÉÔÃí°Õ¤Ë¤è - ¤ë»à¤òÈò¤±¤ë°Ù¤Ë·Ù¹ð¤·¤½¤ì¤Þ¤Ç¤Î¥­¡¼ÆþÎϤò¥¯¥ê¥¢¤·¤Þ¤¹¡£ - ***** ¥È¥é¥Ã¥×´¶ÃÎÈϰϳ°¤Ë½Ð¤ëľÁ°¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë [disturb_trap_detect] Áö¤Ã¤Æ¤¤¤ë¤È¤­¤Ë¥È¥é¥Ã¥×´¶ÃκѤߤÎÎΰè¤Îü¤Þ¤ÇÅþ㤷¤¿¤é¹ÔÆ°¤òÃæ»ß @@ -517,13 +484,6 @@ MP ***** === ¥ª¥×¥·¥ç¥ó5 -- ¸úΨ²½ === -***** -Áö¤Ã¤Æ¤¤¤ë¤È¤­¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¸º¾¯¤¹¤ë [view_reduce_lite] - ¥×¥ì¥¤¥ä¡¼¤¬Áö¤Ã¤Æ¤¤¤ë¤È¤­¡¢»ý¤Ã¤Æ¤¤¤ë¸÷¸»¤Ç¾È¤é¤µ¤ì¤ëÈϰϤò¶¹¤¯¤· - ¤Þ¤¹¡£¤³¤ì¤ÏÁö¤ë¤³¤È¤ò¤è¤ê¥¹¥à¡¼¥º¤Ë¤·¤Þ¤¹¤¬¡¢¶Ëü¤Ëݵƫ¤·¤¤¤Ç¤¹¡£ - ¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤ÎAngband¤Ç¤Ï¡¢¤³¤ÎÆ°ºî¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¢¤Ã¤¿¤¿¤á¡¢¡Ö - ½ã¿è¼çµÁ¼Ô¡×¤Ï¤³¤ì¤òON¤Ë¤·¤¬¤Á¤Ç¤¹¡£ - ***** ³¹¤Ç¤Ï»ëÌî¤ò¶¹¤¯¤¹¤ë [view_reduce_view] ³¹¤Ë¤¤¤ë¤È¤­¡¢¸«¤¨¤ëÈϰϤò¶¹¤¯¤·¤Þ¤¹¡£¤³¤ì¤Ï³¹Ãæ¤Ç¤è¤ê¥¹¥à¡¼¥º¤ËÁö diff --git a/lib/help/option.txt b/lib/help/option.txt index 38948cbf6..00c06494f 100644 --- a/lib/help/option.txt +++ b/lib/help/option.txt @@ -159,16 +159,6 @@ Show items graphics [show_item_graph] Displays small icons of the items in your "inventory" list, "equipment" list and "stores". -***** -Show choices in certain sub-windows [show_choices] - Indicate legal choices in "special" windows which display lists. - -***** -Use special symbols for the player char [player_symbols] - This option is needed only when the system platform is "ibm". - This option allows you to display your character using race / - class / sex dependent colours and graphical symbols. - ***** Display 'equippy' chars [equippy_chars] This option will show you a graphical representation of your worn @@ -289,20 +279,6 @@ Merge discounts when stacking [stack_force_costs] discount. This option may cause you to lose "value", but will give you optimal pack usage. -***** -Allow weapons and armor to stack [stack_allow_items] - Allow identical weapons and armor to be combined into a stack. This - also allows unidentified, but identical, ammo to be combined, which - may result in the auto-identification of some of the ammo, but - which makes it a lot easier to actually use unidentified ammo. - -***** -Expand the power of the look command [expand_look] - Expand the "look" command to allow the user to "look" at grids - which are not actually in view of the player, allowing the - examination of objects/monsters which have only been detected by - spells, or sensed via telepathy. - ***** Expand the power of the list commands [expand_list] Expand the "listing" commands so that they "wrap" at the "edges" of @@ -414,10 +390,6 @@ Run past known corners [find_cut] in "faster" running, but may cause you to run into a "lurking" monster. -***** -Run into potential corners [find_examine] - Fully explore "potential corners" in hallways. - ***** Disturb whenever any monster moves [disturb_move] Disturb the player when any monster moves, appears, or disappears. @@ -468,12 +440,6 @@ Disturb whenever boring things happen [disturb_minor] Audible bell (on errors, etc) [ring_bell] Attempt to make a "bell" noise when various "errors" occur. -***** -Alert user to critical hitpoints [alert_hitpoint] - Produce a "bell" noise, and flush all pending input, when your - hitpoints reach the "critical point" chosen elsewhere, preventing - stupid deaths. - ***** Disturb when leaving trap detected area [disturb_trap_detect] This option causes you to be disturbed when the player is running @@ -488,13 +454,6 @@ Alert when leaving trap detected area [alert_trap_detect] ***** === Option set 5 -- Efficiency === -***** -Reduce lite-radius when running [view_reduce_lite] - Reduce the "radius" of the player's "lite" to that of a "torch" - when the player is "running", which makes running more "efficient", - but is extremely annoying. Certain older versions of Angband used - this behavior always, so "purists" should turn it on. - ***** Reduce view-radius in town [view_reduce_view] Reduce the "radius" of the player's "view" by half when the player diff --git a/lib/pref/pref-opt.prf b/lib/pref/pref-opt.prf index 7ea9fc1a8..680f8907f 100644 --- a/lib/pref/pref-opt.prf +++ b/lib/pref/pref-opt.prf @@ -36,9 +36,7 @@ X:depth_in_feet Y:show_labels Y:show_weights Y:show_item_graph -Y:show_choices X:plain_pickup -X:player_symbols Y:equippy_chars X:display_mutations Y:plain_descriptions @@ -59,8 +57,6 @@ 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 @@ -78,7 +74,6 @@ X:allow_debug_opts X:find_ignore_stairs Y:find_ignore_doors X:find_cut -Y:find_examine X:disturb_move X:disturb_high Y:disturb_near @@ -87,13 +82,11 @@ Y:disturb_panel Y:disturb_state Y:disturb_minor X:ring_bell -Y:alert_hitpoint Y:disturb_trap_detect X:alert_trap_detect ##### Efficiency ##### -X:view_reduce_lite X:view_reduce_view Y:check_abort Y:flush_failure diff --git a/src/cmd1.c b/src/cmd1.c index 942d66a47..2b6adfdde 100644 --- a/src/cmd1.c +++ b/src/cmd1.c @@ -4538,7 +4538,7 @@ static int see_nothing(int dir, int y, int x) * two spaces straight ahead, and the space marked with 's' are both * unknown space, then it is a potential corner and enter if * find_examine is set, otherwise must stop because it is not a - * corner. + * corner. (find_examine option is removed and always is TRUE.) */ @@ -5066,7 +5066,7 @@ static bool run_test(void) } /* Two options, examining corners */ - else if (find_examine && !find_cut) + else if (!find_cut) { /* Primary option */ find_current = option; @@ -5089,8 +5089,7 @@ static bool run_test(void) { /* Can not see anything ahead and in the direction we */ /* are turning, assume that it is a potential corner. */ - if (find_examine && - see_nothing(option, row, col) && + if (see_nothing(option, row, col) && see_nothing(option2, row, col)) { find_current = option; @@ -5171,9 +5170,6 @@ void run_step(int dir) return; } - /* Calculate torch radius */ - p_ptr->update |= (PU_TORCH); - /* Initialize */ run_init(dir); } diff --git a/src/cmd5.c b/src/cmd5.c index cab8e4983..2d9998649 100644 --- a/src/cmd5.c +++ b/src/cmd5.c @@ -128,14 +128,10 @@ static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm redraw = FALSE; /* Show choices */ - if (show_choices) - { - /* Update */ - p_ptr->window |= (PW_SPELL); + p_ptr->window |= (PW_SPELL); - /* Window stuff */ - window_stuff(); - } + /* Window stuff */ + window_stuff(); /* Build a prompt (accept all spells) */ #ifdef JP @@ -317,14 +313,10 @@ static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm /* Show choices */ - if (show_choices) - { - /* Update */ - p_ptr->window |= (PW_SPELL); + p_ptr->window |= (PW_SPELL); - /* Window stuff */ - window_stuff(); - } + /* Window stuff */ + window_stuff(); /* Abort if needed */ diff --git a/src/effects.c b/src/effects.c index 0b763c2aa..67f7e5d01 100644 --- a/src/effects.c +++ b/src/effects.c @@ -5331,7 +5331,7 @@ get_rnd_line("death_j.txt", 0, death_message); if (p_ptr->chp < warning) { /* Hack -- bell on first notice */ - if (alert_hitpoint && (old_chp > warning)) bell(); + if (old_chp > warning) bell(); sound(SOUND_WARN); diff --git a/src/externs.h b/src/externs.h index 3ccf9ea27..2faa69efc 100644 --- a/src/externs.h +++ b/src/externs.h @@ -220,7 +220,6 @@ extern bool ring_bell; extern bool find_ignore_stairs; extern bool find_ignore_doors; extern bool find_cut; -extern bool find_examine; extern bool disturb_near; extern bool disturb_high; extern bool disturb_move; @@ -234,7 +233,6 @@ extern bool flush_failure; extern bool fresh_before; extern bool fresh_after; extern bool fresh_message; -extern bool alert_hitpoint; extern bool disturb_trap_detect; extern bool alert_trap_detect; extern bool view_yellow_lite; @@ -263,20 +261,16 @@ extern bool view_torch_grids; extern bool view_unsafe_grids; extern bool track_follow; extern bool track_target; -extern bool stack_allow_items; extern bool stack_force_notes; extern bool stack_force_costs; -extern bool view_reduce_lite; extern bool view_reduce_view; extern bool manual_haggle; extern bool auto_scum; -extern bool expand_look; extern bool expand_list; extern bool smart_learn; extern bool smart_cheat; extern bool show_labels; extern bool show_weights; -extern bool show_choices; extern bool cheat_peek; extern bool cheat_hear; extern bool cheat_room; @@ -290,7 +284,6 @@ extern bool small_levels; extern bool always_small_levels; extern bool empty_levels; extern bool bound_walls_perm; -extern bool player_symbols; extern bool equippy_chars; extern bool use_command; extern bool center_player; diff --git a/src/hissatsu.c b/src/hissatsu.c index bc79a960b..70010c8f5 100644 --- a/src/hissatsu.c +++ b/src/hissatsu.c @@ -83,12 +83,13 @@ cptr p = "ɬ } /* Build a prompt (accept all spells) */ + (void) strnfmt(out_val, 78, #ifdef JP -(void) strnfmt(out_val, 78, "(%^s %c-%c, '*'¤Ç°ìÍ÷, ESC) ¤É¤Î%s¤ò»È¤¤¤Þ¤¹¤«¡©", + "(%^s %c-%c, '*'¤Ç°ìÍ÷, ESC) ¤É¤Î%s¤ò»È¤¤¤Þ¤¹¤«¡©", #else - (void)strnfmt(out_val, 78, "(%^ss %c-%c, *=List, ESC=exit) Use which %s? ", + "(%^ss %c-%c, *=List, ESC=exit) Use which %s? ", #endif - p, I2A(0), "abcdefghijklmnopqrstuvwxyz012345"[num-1], p); + p, I2A(0), "abcdefghijklmnopqrstuvwxyz012345"[num-1], p); if (use_menu) screen_save(); @@ -292,7 +293,7 @@ put_str("name Lv SP name Lv SP ", y, x + 5); /* Prompt */ #ifdef JP -(void) strnfmt(tmp_val, 78, "%s¤ò»È¤¤¤Þ¤¹¤«¡©", spell_names[technic2magic(REALM_HISSATSU)-1][j]); + (void) strnfmt(tmp_val, 78, "%s¤ò»È¤¤¤Þ¤¹¤«¡©", spell_names[technic2magic(REALM_HISSATSU)-1][j]); #else (void)strnfmt(tmp_val, 78, "Use %s? ", spell_names[technic2magic(REALM_HISSATSU)-1][j]); #endif @@ -310,14 +311,11 @@ put_str("name Lv SP name Lv SP ", y, x + 5); if (redraw) screen_load(); /* Show choices */ - if (show_choices) - { - /* Update */ - p_ptr->window |= (PW_SPELL); + p_ptr->window |= (PW_SPELL); + + /* Window stuff */ + window_stuff(); - /* Window stuff */ - window_stuff(); - } /* Abort if needed */ if (!flag) return (FALSE); diff --git a/src/mane.c b/src/mane.c index d0c159e4f..40c0143d3 100644 --- a/src/mane.c +++ b/src/mane.c @@ -114,13 +114,13 @@ cptr p = "ǽ num = p_ptr->mane_num; /* Build a prompt (accept all spells) */ + (void)strnfmt(out_val, 78, #ifdef JP -(void) strnfmt(out_val, 78, "(%c-%c, '*'¤Ç°ìÍ÷, ESC) ¤É¤Î%s¤ò¤Þ¤Í¤Þ¤¹¤«¡©", + "(%c-%c, '*'¤Ç°ìÍ÷, ESC) ¤É¤Î%s¤ò¤Þ¤Í¤Þ¤¹¤«¡©", #else - (void)strnfmt(out_val, 78, "(%c-%c, *=List, ESC=exit) Use which %s? ", + "(%c-%c, *=List, ESC=exit) Use which %s? ", #endif - - I2A(0), I2A(num - 1), p); + I2A(0), I2A(num - 1), p); /* Get a spell from the user */ @@ -244,7 +244,7 @@ put_str(" /* Prompt */ #ifdef JP -(void) strnfmt(tmp_val, 78, "%s¤ò¤Þ¤Í¤Þ¤¹¤«¡©", monster_powers[p_ptr->mane_spell[i]].name); + (void) strnfmt(tmp_val, 78, "%s¤ò¤Þ¤Í¤Þ¤¹¤«¡©", monster_powers[p_ptr->mane_spell[i]].name); #else (void)strnfmt(tmp_val, 78, "Use %s? ", monster_powers[p_ptr->mane_spell[i]].name); #endif @@ -262,14 +262,10 @@ put_str(" if (redraw) screen_load(); /* Show choices */ - if (show_choices) - { - /* Update */ - p_ptr->window |= (PW_SPELL); + p_ptr->window |= (PW_SPELL); - /* Window stuff */ - window_stuff(); - } + /* Window stuff */ + window_stuff(); /* Abort if needed */ if (!flag) return (FALSE); diff --git a/src/mind.c b/src/mind.c index 839bdfb09..ff5fc9615 100644 --- a/src/mind.c +++ b/src/mind.c @@ -809,14 +809,10 @@ put_str(format("Lv %s Fail Info", ((use_mind == MIND_BERSERKER) || (use_mind if (redraw && !only_browse) screen_load(); /* Show choices */ - if (show_choices) - { - /* Update */ - p_ptr->window |= (PW_SPELL); + p_ptr->window |= (PW_SPELL); - /* Window stuff */ - window_stuff(); - } + /* Window stuff */ + window_stuff(); /* Abort if needed */ if (!flag) return (FALSE); diff --git a/src/mspells3.c b/src/mspells3.c index ea1041650..03e4fcc59 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -418,13 +418,13 @@ cptr p = " } /* Build a prompt (accept all spells) */ + (void)strnfmt(out_val, 78, #ifdef JP -(void) strnfmt(out_val, 78, "(%c-%c, '*'¤Ç°ìÍ÷, ESC) ¤É¤Î%s¤ò¾§¤¨¤Þ¤¹¤«¡©", + "(%c-%c, '*'¤Ç°ìÍ÷, ESC) ¤É¤Î%s¤ò¾§¤¨¤Þ¤¹¤«¡©", #else - (void)strnfmt(out_val, 78, "(%c-%c, *=List, ESC=exit) Use which %s? ", + "(%c-%c, *=List, ESC=exit) Use which %s? ", #endif - - I2A(0), I2A(num - 1), p); + I2A(0), I2A(num - 1), p); if (use_menu) screen_save(); @@ -640,7 +640,7 @@ put_str("MP /* Prompt */ #ifdef JP -(void) strnfmt(tmp_val, 78, "%s¤ÎËâË¡¤ò¾§¤¨¤Þ¤¹¤«¡©", monster_powers[spellnum[i]].name); + (void) strnfmt(tmp_val, 78, "%s¤ÎËâË¡¤ò¾§¤¨¤Þ¤¹¤«¡©", monster_powers[spellnum[i]].name); #else (void)strnfmt(tmp_val, 78, "Use %s? ", monster_powers[spellnum[i]].name); #endif @@ -658,14 +658,10 @@ put_str("MP if (redraw) screen_load(); /* Show choices */ - if (show_choices) - { - /* Update */ - p_ptr->window |= (PW_SPELL); + p_ptr->window |= (PW_SPELL); - /* Window stuff */ - window_stuff(); - } + /* Window stuff */ + window_stuff(); /* Abort if needed */ if (!flag) return (FALSE); diff --git a/src/object1.c b/src/object1.c index f712b1284..e1969e0e4 100644 --- a/src/object1.c +++ b/src/object1.c @@ -5719,41 +5719,39 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode) int get_item_label = 0; /* Show choices */ - if (show_choices) + int ni = 0; + int ne = 0; + + /* Scan windows */ + for (j = 0; j < 8; j++) { - int ni = 0; - int ne = 0; + /* Unused */ + if (!angband_term[j]) continue; - /* Scan windows */ - for (j = 0; j < 8; j++) - { - /* Unused */ - if (!angband_term[j]) continue; + /* Count windows displaying inven */ + if (window_flag[j] & (PW_INVEN)) ni++; - /* Count windows displaying inven */ - if (window_flag[j] & (PW_INVEN)) ni++; + /* Count windows displaying equip */ + if (window_flag[j] & (PW_EQUIP)) ne++; + } - /* Count windows displaying equip */ - if (window_flag[j] & (PW_EQUIP)) ne++; - } + /* Toggle if needed */ + if ((command_wrk && ni && !ne) || + (!command_wrk && !ni && ne)) + { + /* Toggle */ + toggle_inven_equip(); - /* Toggle if needed */ - if ((command_wrk && ni && !ne) || - (!command_wrk && !ni && ne)) - { - /* Toggle */ - toggle_inven_equip(); + /* Track toggles */ + toggle = !toggle; + } - /* Track toggles */ - toggle = !toggle; - } + /* Update */ + p_ptr->window |= (PW_INVEN | PW_EQUIP); - /* Update */ - p_ptr->window |= (PW_INVEN | PW_EQUIP); + /* Redraw windows */ + window_stuff(); - /* Redraw windows */ - window_stuff(); - } /* Inventory screen */ if (!command_wrk) @@ -6302,18 +6300,15 @@ if (ver && !verify(" item_tester_hook = NULL; - /* Clean up */ - if (show_choices) - { - /* Toggle again if needed */ - if (toggle) toggle_inven_equip(); + /* Clean up 'show choices' */ + /* Toggle again if needed */ + if (toggle) toggle_inven_equip(); - /* Update */ - p_ptr->window |= (PW_INVEN | PW_EQUIP); + /* Update */ + p_ptr->window |= (PW_INVEN | PW_EQUIP); - /* Window stuff */ - window_stuff(); - } + /* Window stuff */ + window_stuff(); /* Clear the prompt line */ @@ -6749,41 +6744,38 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode) int get_item_label = 0; /* Show choices */ - if (show_choices) - { - int ni = 0; - int ne = 0; + int ni = 0; + int ne = 0; - /* Scan windows */ - for (j = 0; j < 8; j++) - { - /* Unused */ - if (!angband_term[j]) continue; + /* Scan windows */ + for (j = 0; j < 8; j++) + { + /* Unused */ + if (!angband_term[j]) continue; - /* Count windows displaying inven */ - if (window_flag[j] & (PW_INVEN)) ni++; + /* Count windows displaying inven */ + if (window_flag[j] & (PW_INVEN)) ni++; - /* Count windows displaying equip */ - if (window_flag[j] & (PW_EQUIP)) ne++; - } + /* Count windows displaying equip */ + if (window_flag[j] & (PW_EQUIP)) ne++; + } - /* Toggle if needed */ - if ((command_wrk == (USE_EQUIP) && ni && !ne) || - (command_wrk == (USE_INVEN) && !ni && ne)) - { - /* Toggle */ - toggle_inven_equip(); + /* Toggle if needed */ + if ((command_wrk == (USE_EQUIP) && ni && !ne) || + (command_wrk == (USE_INVEN) && !ni && ne)) + { + /* Toggle */ + toggle_inven_equip(); - /* Track toggles */ - toggle = !toggle; - } + /* Track toggles */ + toggle = !toggle; + } - /* Update */ - p_ptr->window |= (PW_INVEN | PW_EQUIP); + /* Update */ + p_ptr->window |= (PW_INVEN | PW_EQUIP); - /* Redraw windows */ - window_stuff(); - } + /* Redraw windows */ + window_stuff(); /* Inventory screen */ if (command_wrk == (USE_INVEN)) @@ -7740,18 +7732,15 @@ if (ver && !verify(" item_tester_hook = NULL; - /* Clean up */ - if (show_choices) - { - /* Toggle again if needed */ - if (toggle) toggle_inven_equip(); + /* Clean up 'show choices' */ + /* Toggle again if needed */ + if (toggle) toggle_inven_equip(); - /* Update */ - p_ptr->window |= (PW_INVEN | PW_EQUIP); + /* Update */ + p_ptr->window |= (PW_INVEN | PW_EQUIP); - /* Window stuff */ - window_stuff(); - } + /* Window stuff */ + window_stuff(); /* Clear the prompt line */ diff --git a/src/object2.c b/src/object2.c index c90744279..08664fcae 100644 --- a/src/object2.c +++ b/src/object2.c @@ -1667,12 +1667,6 @@ static int object_similar_part(object_type *o_ptr, object_type *j_ptr) case TV_SOFT_ARMOR: case TV_HARD_ARMOR: case TV_DRAG_ARMOR: - { - /* Require permission */ - if (!stack_allow_items) return 0; - - /* Fall through */ - } /* Rings, Amulets, Lites */ case TV_RING: diff --git a/src/tables.c b/src/tables.c index fc1ef4ff2..06a39ecdb 100644 --- a/src/tables.c +++ b/src/tables.c @@ -6653,15 +6653,6 @@ option_type option_info[] = #ifdef JP - { &show_choices, TRUE, 2, 0, 12, - "show_choices", "»ý¤Áʪ/ÁõÈ÷¥¦¥£¥ó¥É¥¦¤ËÁªÂò¥¢¥¤¥Æ¥àɽ¼¨" }, -#else - { &show_choices, TRUE, 2, 0, 12, - "show_choices", "Show choices in certain sub-windows" }, -#endif - - -#ifdef JP { &plain_pickup, FALSE, 2, 6, 6, "plain_pickup", "¡Ö½¦¤Ã¤¿¡×¥á¥Ã¥»¡¼¥¸¤ò´Êά²½¤¹¤ë" }, #else @@ -6671,15 +6662,6 @@ option_type option_info[] = #ifdef JP - { &player_symbols, FALSE, 2, 1, 13, - "player_symbols", "¥×¥ì¥¤¥ä¡¼¤òÆÃÊ̤ʵ­¹æ¤Çɽ¼¨¤¹¤ë"}, -#else - { &player_symbols, FALSE, 2, 1, 13, - "player_symbols", "Use special symbols for the player char"}, -#endif - - -#ifdef JP { &equippy_chars, TRUE, 2, 1, 12, "equippy_chars", "¥¹¥Æ¡¼¥¿¥¹¤Ëʸ»ú¤ÇÁõÈ÷¤òɽ¼¨¤¹¤ë" }, #else @@ -6824,24 +6806,6 @@ option_type option_info[] = #ifdef JP - { &stack_allow_items, TRUE, 3, 1, 2, - "stack_allow_items", "Ʊ¼ï¤ÎÉð´ï¤äËɶñ¤ò¤Þ¤È¤á¤ë" }, -#else - { &stack_allow_items, TRUE, 3, 1, 2, - "stack_allow_items", "Allow weapons and armor to stack" }, -#endif - - -#ifdef JP - { &expand_look, TRUE, 3, 1, 4, - "expand_look", "¡Ö²ó¤ê¤òÄ´¤Ù¤ë¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" }, -#else - { &expand_look, TRUE, 3, 1, 4, - "expand_look", "Expand the power of the look command" }, -#endif - - -#ifdef JP { &expand_list, TRUE, 3, 1, 5, "expand_list", "¡Ö°ìÍ÷¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" }, #else @@ -6974,15 +6938,6 @@ option_type option_info[] = #ifdef JP - { &find_examine, TRUE, 4, 0, 19, - "find_examine", "ÄÌÏ©¤¬°Å¤¤»þ¤Ë¤Ê¤ë¤Ù¤¯¶Ê¤ê³Ñ¤È²¾Äꤷ¤ÆÄ̲᤹¤ë" }, -#else - { &find_examine, TRUE, 4, 0, 19, - "find_examine", "Run into potential corners" }, -#endif - - -#ifdef JP { &disturb_move, FALSE, 4, 0, 20, "disturb_move", "¤É¤³¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" }, #else @@ -7055,15 +7010,6 @@ option_type option_info[] = #ifdef JP - { &alert_hitpoint, TRUE, 4, 0, 26, - "alert_hitpoint", "Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤Î·Ù¹ð»þ¤Ë¥Ó¡¼¥×¤òÌĤ餹" }, -#else - { &alert_hitpoint, TRUE, 4, 0, 26, - "alert_hitpoint", "Alert user to critical hitpoints" }, -#endif - - -#ifdef JP { &disturb_trap_detect, TRUE, 4, 0, 27, "disturb_trap_detect", "¥È¥é¥Ã¥×´¶ÃÎÈϰϳ°¤Ë½Ð¤ëľÁ°¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" }, #else @@ -7083,15 +7029,6 @@ option_type option_info[] = /*** Efficiency ***/ #ifdef JP - { &view_reduce_lite, FALSE, 5, 1, 16, - "view_reduce_lite", "Áö¤Ã¤Æ¤¤¤ë¤È¤­¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¸º¾¯¤¹¤ë" }, -#else - { &view_reduce_lite, FALSE, 5, 1, 16, - "view_reduce_lite", "Reduce lite-radius when running" }, -#endif - - -#ifdef JP { &view_reduce_view, FALSE, 5, 1, 17, "view_reduce_view", "³¹¤Ç¤Ï»ëÌî¤ò¶¹¤¯¤¹¤ë" }, #else diff --git a/src/variable.c b/src/variable.c index 3c7a861e6..83e76df29 100644 --- a/src/variable.c +++ b/src/variable.c @@ -194,7 +194,6 @@ bool stack_force_costs; /* Merge discounts when stacking */ bool show_labels; /* Show labels in object listings */ bool show_weights; /* Show weights in object listings */ -bool show_choices; /* Show choices in certain sub-windows */ bool ring_bell; /* Ring the bell (on errors, etc) */ @@ -206,7 +205,6 @@ bool show_item_graph; bool find_ignore_stairs; /* Run past stairs */ bool find_ignore_doors; /* Run through open doors */ bool find_cut; /* Run past known corners */ -bool find_examine; /* Run into potential corners */ bool disturb_move; /* Disturb whenever any monster moves */ bool disturb_near; /* Disturb whenever viewable monster moves */ @@ -215,7 +213,6 @@ bool disturb_panel; /* Disturb whenever map panel changes */ bool disturb_state; /* Disturn whenever player state changes */ bool disturb_minor; /* Disturb whenever boring things happen */ -bool alert_hitpoint; /* Alert user to critical hitpoints */ bool disturb_trap_detect; /* Disturb when leaving trap detected area */ bool alert_trap_detect; /* Alert when leaving trap detected area */ bool last_words; /* Get last words upon dying */ @@ -224,7 +221,6 @@ bool small_levels; /* Allow unusually small dungeon levels */ bool always_small_levels; /* Use always unusually small dungeon levels */ bool empty_levels; /* Allow empty 'arena' levels */ bool bound_walls_perm; /* Boundary walls are created by permanent wall */ -bool player_symbols; /* Use varying symbols for the player char */ bool equippy_chars; /* Back by popular demand... */ bool display_mutations; /* Skip mutations screen even if we have it */ bool plain_descriptions; /* Plain object descriptions */ @@ -241,9 +237,6 @@ bool manual_haggle; /* Auto-haggle in stores */ bool auto_scum; /* Auto-scum for good levels */ -bool stack_allow_items; /* Allow weapons and armor to stack */ - -bool expand_look; /* Expand the power of the look command */ bool expand_list; /* Expand the power of the list commands */ bool view_perma_grids; /* Map remembers all perma-lit grids */ @@ -261,7 +254,6 @@ bool smart_cheat; /* Monsters exploit player weaknesses */ /* Option Set 4 -- Efficiency */ -bool view_reduce_lite; /* Reduce lite-radius when running */ bool view_reduce_view; /* Reduce view-radius in town */ bool check_abort; /* Avoid checking for user abort */ diff --git a/src/xtra1.c b/src/xtra1.c index 326ba339f..66d8af42c 100644 --- a/src/xtra1.c +++ b/src/xtra1.c @@ -2853,13 +2853,6 @@ static void calc_torch(void) /* end experimental mods */ - /* Reduce lite when running if requested */ - if (running && view_reduce_lite) - { - /* Reduce the lite radius if needed */ - if (p_ptr->cur_lite > 1) p_ptr->cur_lite = 1; - } - /* Notice changes in the "lite radius" */ if (p_ptr->old_lite != p_ptr->cur_lite) { diff --git a/src/xtra2.c b/src/xtra2.c index da59e40ef..292d1db83 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -2986,9 +2986,6 @@ static void target_set_prepare(int mode) { cave_type *c_ptr; - /* Require line of sight, unless "look" is "expanded" */ - if (!expand_look && !player_has_los_bold(y, x)) continue; - /* Require "interesting" contents */ if (!target_set_accept(y, x)) continue; -- 2.11.0