Merge branch 'master' into derek-farming
* master: (41 commits) Add more explicit helpless reasons add data.base suggestion for whistle Use existing function to count containers ... Conflicts: src/do.c src/hack.c src/invent.c src/mon.c src/objnam.c
This commit is contained in:
@@ -927,8 +927,8 @@ register const char *let,*word;
|
||||
|
||||
/* "ugly check" for reading fortune cookies, part 2 */
|
||||
if ((!strcmp(word, "read")
|
||||
&& (otmp->otyp == FORTUNE_COOKIE || otmp->otyp == T_SHIRT)))
|
||||
allowall = TRUE;
|
||||
&& is_readable(otmp)))
|
||||
allowall = usegold = TRUE;
|
||||
}
|
||||
}
|
||||
bp[foo] = 0;
|
||||
|
||||
Reference in New Issue
Block a user