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:
nethack.allison
2002-01-12 02:16:09 +00:00
parent 2e62cf4194
commit f64c0ac241
6 changed files with 10 additions and 12 deletions

View File

@@ -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 */