]> granicus.if.org Git - nethack/commitdiff
Fix coloring of unaligned temple altars
authorMichael Meyer <me@entrez.cc>
Sat, 30 Apr 2022 18:04:18 +0000 (14:04 -0400)
committerMichael Meyer <me@entrez.cc>
Thu, 5 May 2022 14:27:04 +0000 (10:27 -0400)
They were showing up as gray/neutral, rather than red/unaligned.

include/display.h

index 1b39414763209ca4c18ce9ecb3e2c7e075c8b143..1c7bd972d9910aa0612ca80850bac0ced024ad65 100644 (file)
@@ -544,17 +544,17 @@ 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_SANCTUM)) == AM_NONE)  \
-       ? (GLYPH_ALTAR_OFF + altar_unaligned)                   \
-       : ((amsk & AM_SANCTUM) == AM_SANCTUM)                   \
-          ? (GLYPH_ALTAR_OFF + altar_other)                    \
-          : ((amsk & AM_MASK) == AM_CHAOTIC)                   \
-            ? (GLYPH_ALTAR_OFF + altar_chaotic)                \
-            : ((amsk & AM_MASK) == AM_NEUTRAL)                 \
-              ? (GLYPH_ALTAR_OFF + altar_neutral)              \
-              : ((amsk & AM_MASK) == AM_LAWFUL)                \
-                ? (GLYPH_ALTAR_OFF + altar_lawful)             \
-                : (GLYPH_ALTAR_OFF + altar_neutral))
+    ((((amsk) & AM_SANCTUM) == AM_SANCTUM)                \
+      ? (GLYPH_ALTAR_OFF + altar_other)                   \
+      : (((amsk) & AM_MASK) == AM_LAWFUL)                 \
+         ? (GLYPH_ALTAR_OFF + altar_lawful)               \
+         : (((amsk) & AM_MASK) == AM_NEUTRAL)             \
+            ? (GLYPH_ALTAR_OFF + altar_neutral)           \
+            : (((amsk) & AM_MASK) == AM_CHAOTIC)          \
+               ? (GLYPH_ALTAR_OFF + altar_chaotic)        \
+               : (((amsk) & AM_MASK) == AM_NONE)          \
+                  ? (GLYPH_ALTAR_OFF + altar_unaligned)   \
+                  : (GLYPH_ALTAR_OFF + altar_neutral))
 
 /* not used, nor is it correct
 #define zap_to_glyph(zaptype, cmap_idx) \