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

Designate high altars with dedicated altarmask bit

Browse Source 
High altars and normal temple altars had identical altarmasks, so
there was no way to distinguish between the two based on the altarmask
alone.  Instead, anywhere it was necessary to determine whether an altar
was a high altar included a check whether the hero was currently the
Astral Plane or Moloch's Sanctum, and assumed any temple altar was the
high altar.

Since there's an extra, unused bit in altarmask anyway, use it to
explicitly mark high altars -- the lua level files already distinguish
between normal temple altars and so-called 'sanctum' altars anyway, so
rather than throwing away this distinction when generating the level,
keep it in the altarmask and use it in place of various u.uz checks.

I think this would require incrementing EDITLEVEL again...
This commit is contained in:
Michael Meyer
2021-09-22 16:57:29 -04:00
parent 44d5be6eb4
commit 0585fee5ff
7 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/display.h
View File

@@ -544,10 +544,9 @@ enum glyph_offsets {
(((mon)->female == 0) ? GLYPH_PET_MALE_OFF : GLYPH_PET_FEM_OFF))
#define altar_to_glyph(amsk) \
(((amsk & (AM_MASK | AM_SHRINE)) == AM_NONE) \
(((amsk & (AM_MASK | AM_SHRINE | AM_SANCTUM)) == AM_NONE) \
? (GLYPH_ALTAR_OFF + altar_unaligned) \
: (((amsk & AM_SHRINE) == AM_SHRINE) \
&& (Is_astralevel(&u.uz) || Is_sanctum(&u.uz))) \
: ((amsk & AM_SANCTUM) == AM_SANCTUM) \
? (GLYPH_ALTAR_OFF + altar_other) \
: ((amsk & AM_MASK) == AM_CHAOTIC) \
? (GLYPH_ALTAR_OFF + altar_chaotic) \