Since the touchstone uses objclass oc_color we need
to make that field unconditional, otherwise NetHack won't compile without TEXTCOLOR defined. Also provides at least an interim solution for the has_color() problem that Warwick pointed out. Lastly, Archeologists know touchstones.
This commit is contained in:
@@ -91,9 +91,8 @@ struct objclass {
|
||||
uchar oc_oprop; /* property (invis, &c.) conveyed */
|
||||
char oc_class; /* object class */
|
||||
schar oc_delay; /* delay when using such an object */
|
||||
#ifdef TEXTCOLOR
|
||||
uchar oc_color; /* display color of the object */
|
||||
#endif /* TEXTCOLOR */
|
||||
uchar oc_color; /* color of the object */
|
||||
|
||||
short oc_prob; /* probability, used in mkobj() */
|
||||
unsigned short oc_weight; /* encumbrance (1 cn = 0.1 lb.) */
|
||||
short oc_cost; /* base cost in shops */
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* Incrementing EDITLEVEL can be used to force invalidation of old bones
|
||||
* and save files.
|
||||
*/
|
||||
#define EDITLEVEL 1
|
||||
#define EDITLEVEL 2
|
||||
|
||||
#define COPYRIGHT_BANNER_A \
|
||||
"NetHack, Copyright 1985-2002"
|
||||
|
||||
Reference in New Issue
Block a user