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

Merge branch 'no-urace-in-is_foo' of https://github.com/entrez/NetHack into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2022-10-27 10:04:11 -04:00
parent 116f80e8f5 580c5a6e99
commit 8c9d4de9ed
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/mondata.h
View File

@@ -112,21 +112,11 @@
#define is_shapeshifter(ptr) (((ptr)->mflags2 & M2_SHAPESHIFTER) != 0L)
#define is_undead(ptr) (((ptr)->mflags2 & M2_UNDEAD) != 0L)
#define is_were(ptr) (((ptr)->mflags2 & M2_WERE) != 0L)
#define is_elf(ptr) ((((ptr)->mflags2 & M2_ELF) != 0L) \
|| ((ptr) == g.youmonst.data && \
!Upolyd && Race_if(PM_ELF)))
#define is_dwarf(ptr) ((((ptr)->mflags2 & M2_DWARF) != 0L) \
|| ((ptr) == g.youmonst.data && \
!Upolyd && Race_if(PM_DWARF)))
#define is_gnome(ptr) ((((ptr)->mflags2 & M2_GNOME) != 0L) \
|| ((ptr) == g.youmonst.data && \
!Upolyd && Race_if(PM_GNOME)))
#define is_orc(ptr) ((((ptr)->mflags2 & M2_ORC) != 0L) \
|| ((ptr) == g.youmonst.data && \
!Upolyd && Race_if(PM_ORC)))
#define is_human(ptr) ((((ptr)->mflags2 & M2_HUMAN) != 0L) \
|| ((ptr) == g.youmonst.data && \
!Upolyd && Race_if(PM_HUMAN)))
#define is_elf(ptr) (((ptr)->mflags2 & M2_ELF) != 0L)
#define is_dwarf(ptr) (((ptr)->mflags2 & M2_DWARF) != 0L)
#define is_gnome(ptr) (((ptr)->mflags2 & M2_GNOME) != 0L)
#define is_orc(ptr) (((ptr)->mflags2 & M2_ORC) != 0L)
#define is_human(ptr) (((ptr)->mflags2 & M2_HUMAN) != 0L)
#define your_race(ptr) (((ptr)->mflags2 & g.urace.selfmask) != 0L)
#define is_bat(ptr) \
((ptr) == &mons[PM_BAT] || (ptr) == &mons[PM_GIANT_BAT] \

6
src/shk.c
View File

@@ -2761,12 +2761,12 @@ append_honorific(char *buf)
Strcat(buf, honored[rn2(SIZE(honored) - 1) + u.uevent.udemigod]);
if (is_vampire(g.youmonst.data))
Strcat(buf, (flags.female) ? " dark lady" : " dark lord");
else if (is_elf(g.youmonst.data))
else if (maybe_polyd(is_elf(g.youmonst.data), Race_if(PM_ELF)))
Strcat(buf, (flags.female) ? " hiril" : " hir");
else
Strcat(buf, !is_human(g.youmonst.data) ? " creature"
: (flags.female) ? " lady"
: " sir");
: (flags.female) ? " lady"
: " sir");
}
void