current_fruit (trunk only)
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:
@@ -79,6 +79,7 @@ struct context_info {
|
||||
/* 3: FH, 4: ff+, 5: ff-, 6: FF+, 7: FF- */
|
||||
/* 8: travel */
|
||||
unsigned startingpet_mid;
|
||||
int current_fruit; /* fruit->fid corresponding to pl_fruit[] */
|
||||
int warnlevel;
|
||||
int rndencode; /* randomized escape sequence introducer */
|
||||
long next_attrib_check; /* next attribute check */
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* SCCS Id: @(#)decl.h 3.5 2008/01/30 */
|
||||
/* SCCS Id: @(#)decl.h 3.5 2008/07/20 */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -131,7 +131,6 @@ E NEARDATA char pl_character[PL_CSIZ];
|
||||
E NEARDATA char pl_race; /* character's race */
|
||||
|
||||
E NEARDATA char pl_fruit[PL_FSIZ];
|
||||
E NEARDATA int current_fruit;
|
||||
E NEARDATA struct fruit *ffruit;
|
||||
|
||||
E NEARDATA char tune[6];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* SCCS Id: @(#)patchlevel.h 3.5 2007/04/01 */
|
||||
/* SCCS Id: @(#)patchlevel.h 3.5 2008/07/20 */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* Incrementing EDITLEVEL can be used to force invalidation of old bones
|
||||
* and save files.
|
||||
*/
|
||||
#define EDITLEVEL 40
|
||||
#define EDITLEVEL 41
|
||||
|
||||
#define COPYRIGHT_BANNER_A \
|
||||
"NetHack, Copyright 1985-2007"
|
||||
|
||||
Reference in New Issue
Block a user