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

current_fruit (trunk only)

Browse Source 
I almost abandoned this when Michael beat me to it, but besides
handling the fruit rename bug it also moves `current_fruit' into the
context structure to eliminate separate save/restore for that.
This commit is contained in:
nethack.rankin
2008-07-21 00:03:41 +00:00
parent 60b7b2c0f0
commit 35493a3545
11 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/options.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)options.c 3.5 2008/02/19 */
/* SCCS Id: @(#)options.c 3.5 2008/07/20 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -4106,13 +4106,12 @@ char *str;
lastf = f;
if(f->fid > highest_fruit_id) highest_fruit_id = f->fid;
if (!strncmp(str, f->fname, PL_FSIZ-1) ||
(*altname && !strcmp(altname, f->fname))) {
highest_fruit_id = f->fid;
(*altname && !strcmp(altname, f->fname)))
goto nonew;
}
}
/* if adding another fruit would overflow spe, use a random
fruit instead... we've got a lot to choose from. */
fruit instead... we've got a lot to choose from.
current_fruit remains as is. */
if (highest_fruit_id >= 127) return rnd(127);
highest_fruit_id++;
f = newfruit();
@@ -4121,8 +4120,8 @@ char *str;
copynchars(f->fname, *altname ? altname : str, PL_FSIZ-1);
f->fid = highest_fruit_id;
f->nextf = 0;
nonew:
if (user_specified) current_fruit = highest_fruit_id;
nonew:
if (user_specified) context.current_fruit = f->fid;
return f->fid;
}