nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Make AUTOPICKUP_EXCEPTIONS unconditional.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-27 19:06:17 -05:00
parent b138d380ea
commit 74e741bbbc
10 changed files with 10 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/config.h
View File

@@ -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 */

4
include/decl.h
View File

@@ -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;

6
include/extern.h
View File

@@ -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 ### */

4
include/flag.h
View File

@@ -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];

4
include/wceconf.h
View File

@@ -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.