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

Since the touchstone uses objclass oc_color we need

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/o_init.c
View File

@@ -75,9 +75,7 @@ shuffle(o_low, o_high, domaterial)
{
int i, j, num_to_shuffle;
short sw;
#ifdef TEXTCOLOR
int color;
#endif /* TEXTCOLOR */
for (num_to_shuffle = 0, j=o_low; j <= o_high; j++)
if (!objects[j].oc_name_known) num_to_shuffle++;
@@ -94,11 +92,10 @@ shuffle(o_low, o_high, domaterial)
sw = objects[j].oc_tough;
objects[j].oc_tough = objects[i].oc_tough;
objects[i].oc_tough = sw;
#ifdef TEXTCOLOR
color = objects[j].oc_color;
objects[j].oc_color = objects[i].oc_color;
objects[i].oc_color = color;
#endif /* TEXTCOLOR */
/* shuffle material */
if (domaterial) {
sw = objects[j].oc_material;