From: nhmall Date: Fri, 30 Oct 2020 13:14:23 +0000 (-0400) Subject: revert to numeric X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96ba25241c7ee47e1f830ff041988cf7a4656cdc;p=nethack revert to numeric --- diff --git a/include/align.h b/include/align.h index 45b10d768..f6539ceed 100644 --- a/include/align.h +++ b/include/align.h @@ -46,8 +46,8 @@ typedef struct align { /* alignment & record */ /* Because clearly Nethack needs more ways to specify alignment. The Amask2msa AM_LAWFUL check needs to mask with AM_MASK to strip off possible AM_SHRINE bit */ -#define Amask2msa(x) (((x) & AM_MASK) == AM_LAWFUL ? 3 : (x) & AM_MASK) -#define Msa2amask(x) ((x) == 3 ? AM_LAWFUL : (x)) +#define Amask2msa(x) (((x) & AM_MASK) == 4 ? 3 : (x) & AM_MASK) +#define Msa2amask(x) ((x) == 3 ? 4 : (x)) #define MSA_NONE 0 /* unaligned or multiple alignments */ #define MSA_LAWFUL 1 #define MSA_NEUTRAL 2