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

named fruit vs glob bit

Browse Source 
3.7 has a new size prefix for globs that 3.6 didn't.  The code that
decides whether player is naming slime molds after an actual object
needs to know about it.
This commit is contained in:
PatR
2022-05-23 11:31:48 -07:00
parent 4cb397b502
commit 99cacd3105
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/options.c
View File

@@ -7230,8 +7230,6 @@ fruitadd(char *str, struct fruit *replace_fruit)
str==pl_fruit but makesingular() creates a copy
so we need to copy that back into pl_fruit */
nmcpy(g.pl_fruit, makesingular(str), PL_FSIZ);
/* (assertion doesn't matter; we use 'g.pl_fruit' from here on out) */
/* assert( str == g.pl_fruit ); */
/* disallow naming after other foods (since it'd be impossible
* to tell the difference); globs might have a size prefix which
@@ -7239,8 +7237,9 @@ fruitadd(char *str, struct fruit *replace_fruit)
*/
globpfx = (!strncmp(g.pl_fruit, "small ", 6)
|| !strncmp(g.pl_fruit, "large ", 6)) ? 6
: (!strncmp(g.pl_fruit, "very large ", 11)) ? 11
: 0;
: (!strncmp(g.pl_fruit, "medium ", 7)) ? 7
: (!strncmp(g.pl_fruit, "very large ", 11)) ? 11
: 0;
for (i = g.bases[FOOD_CLASS]; objects[i].oc_class == FOOD_CLASS; i++) {
if (!strcmp(OBJ_NAME(objects[i]), g.pl_fruit)
|| (globpfx > 0