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

priest/minion bits (trunk only)

Browse Source 
Cleanup up a couple of priest and minion allocation/conversion bits.
Also, restrict minion naming so that "guardian <foo>" is only applied when
<foo> is an Angel.  (That restores old behavior from before a change I made
last October; it prevents the guardian Angel from being recognized while
hallucinating.  It probably affects slash'em too, where they have tame
minions besides the astral level's guardian Angel.)
This commit is contained in:
nethack.rankin
2006-01-12 06:24:23 +00:00
parent 3b127d31d9
commit b98f6a6ccb
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/minion.c
View File

@@ -138,12 +138,11 @@ boolean talk;
if (mnum == NON_PM) {
mon = 0;
} else if (mnum == PM_ANGEL) {
mon = makemon(&mons[mnum], u.ux, u.uy, MM_EPRI|MM_EMIN);
mon = makemon(&mons[mnum], u.ux, u.uy, MM_EMIN);
if (mon) {
mon->isminion = 1;
EMIN(mon)->min_align = alignment;
EMIN(mon)->renegade = FALSE;
EPRI(mon)->shralign = alignment;
}
} else if (mnum != PM_SHOPKEEPER && mnum != PM_GUARD &&
mnum != PM_ALIGNED_PRIEST && mnum != PM_HIGH_PRIEST) {