Make AUTOPICKUP_EXCEPTIONS unconditional.

diff --git a/include/config.h b/include/config.h
index 399217b6f6c0146369fa0a6effac3dee0bb11a8e..282b6949b9a57ffa47d00a3445c0acf58e9ce038 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 config.h        $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 config.h        $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.48 $ */
 /* NetHack 3.5 config.h        $Date: 2012/01/27 20:15:26 $  $Revision: 1.37 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -424,7 +424,6 @@ typedef unsigned char       uchar;
 # define CLIPPING      /* allow smaller screens -- ERS */
 # endif
 #endif
-#define AUTOPICKUP_EXCEPTIONS  /* exceptions to autopickup */
 
 #ifdef REDO
 # define DOAGAIN '\001' /* ^A, the "redo" key used in cmd.c and getline.c */

diff --git a/include/decl.h b/include/decl.h
index 1e882705f4b98a270c8a4609814772c20598b620..4733b531725515d0672cdce6936d7bbd7132e469 100644 (file)
--- a/include/decl.h
+++ b/include/decl.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 decl.h  $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 decl.h  $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.50 $ */
 /* NetHack 3.5 decl.h  $Date: 2011/12/29 20:06:27 $  $Revision: 1.44 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -381,13 +381,11 @@ E char *fqn_prefix_names[PREFIX_COUNT];
 
 E NEARDATA struct savefile_info sfcap, sfrestinfo, sfsaveinfo;
 
-#ifdef AUTOPICKUP_EXCEPTIONS
 struct autopickup_exception {
        char *pattern;
        boolean grab;
        struct autopickup_exception *next;
 };
-#endif /* AUTOPICKUP_EXCEPTIONS */
 
 #ifdef PANICTRACE
 E char *ARGV0;

diff --git a/include/extern.h b/include/extern.h
index e4cccef6f1f598558a01514b587df5c0ce330c89..be15406c2e1801e4277dae1afbb6977dabd5c877 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 extern.h        $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 extern.h        $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.390 $ */
 /* NetHack 3.5 extern.h        $Date: 2013/11/05 00:57:53 $  $Revision: 1.380 $ */
 /* Copyright (c) Steve Creps, 1988.                              */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1587,10 +1587,8 @@ E void FDECL(set_duplicate_opt_detection, (int));
 E void FDECL(set_wc_option_mod_status, (unsigned long, int));
 E void FDECL(set_wc2_option_mod_status, (unsigned long, int));
 E void FDECL(set_option_mod_status, (const char *,int));
-#ifdef AUTOPICKUP_EXCEPTIONS
 E int FDECL(add_autopickup_exception, (const char *));
 E void NDECL(free_autopickup_exceptions);
-#endif /* AUTOPICKUP_EXCEPTIONS */
 #ifdef LOADSYMSETS
 E int FDECL(load_symset, (const char *,int));
 E void FDECL(parsesymbols, (char *));
@@ -1687,9 +1685,7 @@ E boolean FDECL(container_gone, (int (*)(OBJ_P)));
 E int FDECL(use_container, (struct obj **,int));
 E int FDECL(loot_mon, (struct monst *,int *,boolean *));
 E int NDECL(dotip);
-#ifdef AUTOPICKUP_EXCEPTIONS
 E boolean FDECL(is_autopickup_exception, (struct obj *, BOOLEAN_P));
-#endif /* AUTOPICKUP_EXCEPTIONS */
 
 /* ### pline.c ### */
 

diff --git a/include/flag.h b/include/flag.h
index 1f53bdec69216a22d89d2b5f9441bde5cca5dd23..2b5d2c3ee8f2312574d9e291a79643355747c097 100644 (file)
--- a/include/flag.h
+++ b/include/flag.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 flag.h  $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 flag.h  $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.60 $ */
 /* NetHack 3.5 flag.h  $Date: 2012/04/09 02:56:32 $  $Revision: 1.59 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -297,11 +297,9 @@ struct instance_flags {
        boolean  cmdassist;     /* provide detailed assistance for some commands */
        boolean  clicklook;     /* allow right-clicking for look */
        boolean  obsolete;      /* obsolete options can point at this, it isn't used */
-#ifdef AUTOPICKUP_EXCEPTIONS
        struct autopickup_exception *autopickup_exceptions[2];
 #define AP_LEAVE 0
 #define AP_GRAB         1
-#endif
 #ifdef WIN32CON
 #define MAX_ALTKEYHANDLER 25
        char     altkeyhandler[MAX_ALTKEYHANDLER];

diff --git a/include/wceconf.h b/include/wceconf.h
index c5fef154789bf4ad43fbedfa28db24dd9c38260e..80833476831f5726cb2c13a5db29c9b45886ba9e 100644 (file)
--- a/include/wceconf.h
+++ b/include/wceconf.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 wceconf.h       $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 wceconf.h       $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.12 $ */
 /* NetHack 3.5 wceconf.h       $Date: 2009/10/22 02:59:14 $  $Revision: 1.12 $ */
 /* Copyright (C) 2001 by Alex Kompel    */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -44,8 +44,6 @@
 
 #define USER_SOUNDS
 
-#define AUTOPICKUP_EXCEPTIONS
-
 /*
  * -----------------------------------------------------------------
  *  The remaining code shouldn't need modification.

diff --git a/src/files.c b/src/files.c
index f45db8bceb26ee8c2eed319c30ed5a5a751e07e2..5d8b2bf2e319c597ff30e1c981673b86304528d6 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 files.c $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 files.c $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.127 $ */
 /* NetHack 3.5 files.c $Date: 2012/03/10 02:49:08 $  $Revision: 1.124 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -2020,10 +2020,8 @@ int              src;
                parseoptions(bufp, TRUE, TRUE);
                if (plname[0])          /* If a name was given */
                        plnamesuffix(); /* set the character class */
-#ifdef AUTOPICKUP_EXCEPTIONS
        } else if (match_varname(buf, "AUTOPICKUP_EXCEPTION", 5)) {
                add_autopickup_exception(bufp);
-#endif
 #ifdef NOCWD_ASSUMPTIONS
        } else if (match_varname(buf, "HACKDIR", 4)) {
                adjust_prefix(bufp, HACKPREFIX);

diff --git a/src/options.c b/src/options.c
index dc8cbcfc2886d7656d9805d10c67407df7868734..ecb2591597ecea6eb353e4948db96d1c74aa7286 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 options.c       $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 options.c       $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.156 $ */
 /* NetHack 3.5 options.c       $Date: 2012/04/09 02:56:30 $  $Revision: 1.153 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -501,10 +501,8 @@ STATIC_OVL boolean FDECL(is_wc_option, (const char *));
 STATIC_OVL boolean FDECL(wc_supported, (const char *));
 STATIC_OVL boolean FDECL(is_wc2_option, (const char *));
 STATIC_OVL boolean FDECL(wc2_supported, (const char *));
-#ifdef AUTOPICKUP_EXCEPTIONS
 STATIC_DCL void FDECL(remove_autopickup_exception, (struct autopickup_exception *));
 STATIC_OVL int FDECL(count_ape_maps, (int *, int *));
-#endif
 
 /* check whether a user-supplied option string is a proper leading
    substring of a particular option name; option string might have
@@ -2923,12 +2921,10 @@ doset()
        add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_UNSELECTED);
 # endif
 #endif
-#ifdef AUTOPICKUP_EXCEPTIONS
        any.a_int = -1;
        Sprintf(buf, "autopickup exceptions (%d currently set)",
                count_ape_maps((int *)0, (int *)0));
        add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_UNSELECTED);
-#endif /* AUTOPICKUP_EXCEPTIONS */
 #ifdef PREFIXES_IN_USE
        any = zeroany;
        add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED);
@@ -2948,12 +2944,10 @@ doset()
             */
            for (pick_idx = 0; pick_idx < pick_cnt; ++pick_idx) {
                opt_indx = pick_list[pick_idx].item.a_int - 1;
-#ifdef AUTOPICKUP_EXCEPTIONS
                if (opt_indx == -2) {   /* -3 due to -1 offset for select_menu() */
                    (void)special_handling("autopickup_exception",
                                           setinitial, fromfile);
                } else
-#endif
 #ifdef STATUS_VIA_WINDOWPORT
 # ifdef STATUS_HILITES
                if (opt_indx == -3) {   /* -3 due to -1 offset for select_menu() */
@@ -3020,9 +3014,7 @@ boolean setinitial,setfromfile;
 
     /* Special handling of menustyle, pickup_burden, pickup_types,
      * disclose, runmode, msg_window, menu_headings, and number_pad options.
-#ifdef AUTOPICKUP_EXCEPTIONS
      * Also takes care of interactive autopickup_exception_handling changes.
-#endif
      */
     if (!strcmp("menustyle", optname)) {
        const char *style_name;
@@ -3296,7 +3288,6 @@ boolean setinitial,setfromfile;
        }
        destroy_nhwindow(tmpwin);
     } else if (!strcmp("autopickup_exception", optname)) {
-#ifdef AUTOPICKUP_EXCEPTIONS
        int pick_cnt, pick_idx, opt_idx, pass;
        int totalapes = 0, numapes[2] = {0,0};
        menu_item *pick_list = (menu_item *)0;
@@ -3392,7 +3383,6 @@ boolean setinitial,setfromfile;
                destroy_nhwindow(tmpwin);
                if (pick_cnt >= 0) goto ape_again;
        }
-#endif /* AUTOPICKUP_EXCEPTIONS */
     } else if (!strcmp("symset", optname)
            || !strcmp("roguesymset", optname)) {
        menu_item *symset_pick = (menu_item *)0;
@@ -3897,12 +3887,10 @@ dotogglepickup()
        if (flags.pickup) {
            oc_to_str(flags.pickup_types, ocl);
            Sprintf(buf, "ON, for %s objects%s", ocl[0] ? ocl : "all",
-#ifdef AUTOPICKUP_EXCEPTIONS
                        (iflags.autopickup_exceptions[AP_LEAVE] ||
                         iflags.autopickup_exceptions[AP_GRAB]) ?
                         ((count_ape_maps((int *)0, (int *)0) == 1) ?
                            ", with one exception" : ", with some exceptions") :
-#endif
                        "");
        } else {
            Strcpy(buf, "OFF");
@@ -3911,7 +3899,6 @@ dotogglepickup()
        return 0;
 }
 
-#ifdef AUTOPICKUP_EXCEPTIONS
 int
 add_autopickup_exception(mapping)
 const char *mapping;
@@ -4004,7 +3991,6 @@ free_autopickup_exceptions()
                }
        }
 }
-#endif /* AUTOPICKUP_EXCEPTIONS */
 
 #ifdef LOADSYMSETS
 /* bundle some common usage into one easy-to-use routine */

diff --git a/src/pickup.c b/src/pickup.c
index ee0d91dc7c83d34509576d5b41f143a23db5df40..2c1564f84cdf72e8f85f11ba82fb5a82ab467add 100644 (file)
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 pickup.c        $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 pickup.c        $NHDT-Date: 1425081977 2015/02/28 00:06:17 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.126 $ */
 /* NetHack 3.5 pickup.c        $Date: 2012/02/16 03:01:38 $  $Revision: 1.123 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -612,7 +612,6 @@ end_query:
        return (n_tried > 0);
 }
 
-#ifdef AUTOPICKUP_EXCEPTIONS
 boolean
 is_autopickup_exception(obj, grab)
 struct obj *obj;
@@ -631,7 +630,6 @@ boolean grab;        /* forced pickup, rather than forced leave behind? */
        }
        return FALSE;
 }
-#endif /* AUTOPICKUP_EXCEPTIONS */
 
 /*
  * Pick from the given list using flags.pickup_types.  Return the number
@@ -655,12 +653,10 @@ menu_item **pick_list;    /* list of objects and counts to pick up */
        /* first count the number of eligible items */
        for (n = 0, curr = olist; curr; curr = FOLLOW(curr, follow)) {
            pickit = (!*otypes || index(otypes, curr->oclass));
-#ifdef AUTOPICKUP_EXCEPTIONS
            /* check for "always pick up */
            if (!pickit) pickit = is_autopickup_exception(curr, TRUE);
            /* then for "never pick up */
            if (pickit) pickit = !is_autopickup_exception(curr, FALSE);
-#endif
            /* pickup_thrown overrides pickup_types and exceptions */
            if (!pickit) pickit = (flags.pickup_thrown && curr->was_thrown);
            /* finally, do we count this object? */
@@ -671,10 +667,8 @@ menu_item **pick_list;     /* list of objects and counts to pick up */
            *pick_list = pi = (menu_item *) alloc(sizeof(menu_item) * n);
            for (n = 0, curr = olist; curr; curr = FOLLOW(curr, follow)) {
                pickit = (!*otypes || index(otypes, curr->oclass));
-#ifdef AUTOPICKUP_EXCEPTIONS
                if (!pickit) pickit = is_autopickup_exception(curr, TRUE);
                if (pickit) pickit = !is_autopickup_exception(curr, FALSE);
-#endif
                if (!pickit) pickit = (flags.pickup_thrown && curr->was_thrown);
                if (pickit) {
                    pi[n].item.a_obj = curr;

diff --git a/src/save.c b/src/save.c
index 1fa51dfaa9bc0d86dfbee2b659556cea44132ca6..d7828655ab615631e92295f1d6eaf172105ad5f6 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 save.c  $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 save.c  $NHDT-Date: 1425081977 2015/02/28 00:06:17 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.59 $ */
 /* NetHack 3.5 save.c  $Date: 2012/02/16 02:40:24 $  $Revision: 1.53 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1345,9 +1345,7 @@ freedynamicdata()
        if (iflags.wc_font_menu) free(iflags.wc_font_menu);
        if (iflags.wc_font_status) free(iflags.wc_font_status);
        if (iflags.wc_tile_file) free(iflags.wc_tile_file);
-#ifdef AUTOPICKUP_EXCEPTIONS
        free_autopickup_exceptions();
-#endif
 #endif /* FREE_ALL_MEMORY */
 #ifdef STATUS_VIA_WINDOWPORT
        status_finish();

diff --git a/util/makedefs.c b/util/makedefs.c
index b0d9f2078af28e291ebaf632a5cb952a7a09f2af..c61b561d1c5cafcc1f544eb0a50ca212f4737bbd 100644 (file)
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5  makedefs.c  $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5  makedefs.c  $NHDT-Date: 1425081977 2015/02/28 00:06:17 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.61 $ */
 /* NetHack 3.5  makedefs.c  $Date: 2012/01/15 09:27:03 $  $Revision: 1.50 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* Copyright (c) M. Stephenson, 1990, 1991.                      */
@@ -1208,9 +1208,6 @@ static const char *build_opts[] = {
 #ifdef ANSI_DEFAULT
                "ANSI default terminal",
 #endif
-#ifdef AUTOPICKUP_EXCEPTIONS
-               "autopickup exceptions",
-#endif
 #ifdef TEXTCOLOR
                "color",
 #endif