From: Pasi Kallinen <paxed@alt.org>
Date: Wed, 27 May 2015 17:42:06 +0000 (+0300)
Subject: Rename omit_buc option to implicit_uncursed
X-Git-Tag: NetHack-3.6.0_RC01~346
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=773eecc4726cfa8a652280c0494654af1abfed05;p=nethack

Rename omit_buc option to implicit_uncursed

... so the name is less cryptic.
---

diff --git a/dat/opthelp b/dat/opthelp
index 54a348b73..32edf0012 100644
--- a/dat/opthelp
+++ b/dat/opthelp
@@ -17,6 +17,7 @@ fixinv         try to retain the same letter for the same object  [TRUE]
 help           print all available info when using the / command  [TRUE]
 IBMgraphics    use IBM extended characters for the dungeon        [FALSE]
 ignintr        ignore interrupt signal, including breaks          [FALSE]
+implicit_uncursed  omit "uncursed" from inventory, if possible    [TRUE]
 legacy         print introductory message                         [TRUE]
 lit_corridor   show a dark corridor as lit if in sight            [FALSE]
 lootabc        use a/b/c rather than o/i/b when looting           [FALSE]
@@ -24,7 +25,6 @@ mail           enable the mail daemon                             [TRUE]
 null           allow nulls to be sent to your terminal            [TRUE]
                try turning this option off (forcing NetHack to use its own
                delay code) if moving objects seem to teleport across rooms
-omit_buc       omit "uncursed" from inventory, if possible        [TRUE]
 perm_invent    keep inventory in a permanent window               [FALSE]
 pickup_thrown  override pickup_types for thrown objects           [TRUE]
 pushweapon     when wielding a new weapon, put your previously
diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index 3a7df513a..d086687c9 100644
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -2051,6 +2051,8 @@ Name your starting horse (ex. ``horsename:Trigger'').
 Cannot be set with the `O' command.
 .lp ignintr
 Ignore interrupt signals, including breaks (default off).
+.lp implicit_uncursed
+Omit "uncursed" from inventory lists, if possible (default on).
 .lp legacy
 Display an introductory message when starting the game (default on).
 .lp lit_corridor
@@ -2196,8 +2198,6 @@ location of the `y' and `z' keys swapped.)
 When moving by numbers, to enter a count prefix for those commands
 which accept one (such as ``12s'' to search twelve times), precede it
 with the letter `n' (``n12s'').
-.lp omit_buc
-Omit "uncursed" from inventory lists, if possible (default on).
 .lp packorder
 Specify the order to list object types in (default ``")[%?+!=/(*`0_'').
 The value of this option should be a string containing the
diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index 566402cd9..7ff441fdf 100644
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -2478,6 +2478,9 @@ Cannot be set with the `{\tt O}' command.
 \item[\ib{ignintr}]
 Ignore interrupt signals, including breaks (default off).
 %.lp
+\item[\ib{implicit\_uncursed}]
+Omit ``uncursed'' from inventory lists, if possible (default on).
+%.lp
 \item[\ib{legacy}]
 Display an introductory message when starting the game (default on).
 %.lp
@@ -2641,9 +2644,6 @@ When moving by numbers, to enter a count prefix for those commands
 which accept one (such as ``{\tt 12s}'' to search twelve times), precede it
 with the letter `{\tt n}' (``{\tt n12s}'').
 %.lp
-\item[\ib{omit\_buc}]
-Omit ``uncursed'' from inventory lists, if possible (default on).
-%.lp
 \item[\ib{packorder}]
 Specify the order to list object types in (default
 ``\verb&")[%?+!=/(*`0_&''). The value of this option should be a string
diff --git a/include/flag.h b/include/flag.h
index e849549af..3d2139f2d 100644
--- a/include/flag.h
+++ b/include/flag.h
@@ -194,7 +194,7 @@ struct instance_flags {
     boolean deferred_X;       /* deferred entry into explore mode */
     boolean num_pad;          /* use numbers for movement commands */
     boolean news;             /* print news */
-    boolean omit_buc;         /* omit "uncursed" status in inventory lists */
+    boolean implicit_uncursed; /* maybe omit "uncursed" status in inventory */
     boolean mention_walls;    /* give feedback when bumping walls */
     boolean menu_tab_sep;     /* Use tabs to separate option menu fields */
     boolean menu_head_objsym; /* Show obj symbol in menu headings */
diff --git a/src/objnam.c b/src/objnam.c
index 72842b6b6..e249ab3d1 100644
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -778,7 +778,7 @@ register struct obj *obj;
             Strcat(prefix, "cursed ");
         else if (obj->blessed)
             Strcat(prefix, "blessed ");
-        else if (!iflags.omit_buc
+        else if (!iflags.implicit_uncursed
             /* For most items with charges or +/-, if you know how many
              * charges are left or what the +/- is, then you must have
              * totally identified the item, so "uncursed" is unneccesary,
diff --git a/src/options.c b/src/options.c
index 9b767a810..65a41c01d 100644
--- a/src/options.c
+++ b/src/options.c
@@ -132,6 +132,7 @@ static struct Bool_Opt {
 #else
     { "ignintr", (boolean *) 0, FALSE, SET_IN_FILE },
 #endif
+    { "implicit_uncursed", &iflags.implicit_uncursed, TRUE, SET_IN_GAME },
     { "large_font", &iflags.obsolete, FALSE, SET_IN_FILE }, /* OBSOLETE */
     { "legacy", &flags.legacy, TRUE, DISP_IN_GAME },
     { "lit_corridor", &flags.lit_corridor, FALSE, SET_IN_GAME },
@@ -154,7 +155,6 @@ static struct Bool_Opt {
 #endif
     { "nudist", &u.uroleplay.nudist, FALSE, DISP_IN_GAME },
     { "null", &flags.null, TRUE, SET_IN_GAME },
-    { "omit_buc", &iflags.omit_buc, TRUE, SET_IN_GAME },
 #if defined(SYSFLAGS) && defined(MAC)
     { "page_wait", &sysflags.page_wait, TRUE, SET_IN_GAME },
 #else