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

Merge https://github.com/Vivit-R/NetHack into Vivit-autopickup-exceptions-3.6

Browse Source
This commit is contained in:
nhmall
2019-09-30 10:48:18 -04:00
parent da6c393e43 ca95246903
commit 657b65bd3c
5 changed files with 51 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/extern.h
View File

@@ -1893,7 +1893,7 @@ E boolean NDECL(u_handsy);
E int FDECL(use_container, (struct obj **, int, BOOLEAN_P));
E int FDECL(loot_mon, (struct monst *, int *, boolean *));
E int NDECL(dotip);
E boolean FDECL(is_autopickup_exception, (struct obj *, BOOLEAN_P));
E struct autopickup_exception *FDECL(check_autopickup_exceptions, (struct obj *));
E boolean FDECL(autopick_testobj, (struct obj *, BOOLEAN_P));
/* ### pline.c ### */

4
include/flag.h
View File

@@ -423,9 +423,7 @@ struct instance_flags {
int wc2_statuslines; /* default = 2, curses can handle 3 */
int wc2_windowborders; /* display borders on NetHack windows */
int wc2_petattr; /* text attributes for pet */
struct autopickup_exception *autopickup_exceptions[2];
#define AP_LEAVE 0
#define AP_GRAB 1
struct autopickup_exception *autopickup_exceptions;
#ifdef WIN32
#define MAX_ALTKEYHANDLER 25
char altkeyhandler[MAX_ALTKEYHANDLER];