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

autopickup_exceptions enhancement

Browse Source 
An enhancement to the original to allow
two types of exceptions:
      always pickup
      never pickup

To specify "never pickup", begin the pattern string with '>'
which is NetHack's down direction symbol (for "leave it down")

To specify "always pickup", begin the pattern string with '<'
which is NetHack's up direction symbol.

For example, to pick up all arrows, regardless of the pickup_
types setting:
autopickup_exception = "<*arrows"
This commit is contained in:
nethack.allison
2003-11-15 02:49:07 +00:00
parent a89c7cfa60
commit e9afb34423
4 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/options.c
View File

@@ -2846,8 +2846,10 @@ boolean setinitial,setfromfile;
tmpwin = create_nhwindow(NHW_TEXT);
ape = iflags.autopickup_exceptions;
for (i = 0; i < numapes && ape; i++) {
Sprintf(apebuf, "\"%s\"", ape->pattern);
putstr(tmpwin, 0, ape->pattern);
Sprintf(apebuf, "\"%s\" (%s)",
ape->pattern,
ape->grab ? "always pickup" : "never pickup");
putstr(tmpwin, 0, apebuf);
ape = ape->next;
}
display_nhwindow(tmpwin, FALSE);
@@ -3172,18 +3174,28 @@ add_autopickup_exception_mapping(mapping)
const char *mapping;
{
struct autopickup_exception *newape, *ape;
char text[256];
char text[256], *text2;
static int allocsize = 0;
int textsize = 0;
boolean grab = FALSE;
if (sscanf(mapping, "\"%255[^\"]\"", text) == 1) {
textsize = strlen(text);
text2 = &text[0];
if (*text2 == '<') { /* force autopickup */
grab = TRUE;
++text2;
} else if (*text2 == '>') { /* default - Do not pickup */
grab = FALSE;
++text2;
}
textsize = strlen(text2);
if (!iflags.autopickup_exceptions) {
iflags.autopickup_exceptions = (struct autopickup_exception *)
alloc(sizeof(struct autopickup_exception));
iflags.autopickup_exceptions->pattern = (char *)
alloc(textsize+1);
Strcpy(iflags.autopickup_exceptions->pattern, text);
Strcpy(iflags.autopickup_exceptions->pattern, text2);
iflags.autopickup_exceptions->grab = grab;
iflags.autopickup_exceptions->next =
(struct autopickup_exception *)0;
} else {
@@ -3191,7 +3203,8 @@ const char *mapping;
newape = (struct autopickup_exception *)alloc(
sizeof(struct autopickup_exception));
newape->pattern = (char *)alloc(textsize+1);
Strcpy(newape->pattern, text);
Strcpy(newape->pattern, text2);
newape->grab = grab;
newape->next = iflags.autopickup_exceptions;
iflags.autopickup_exceptions = newape;
}