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

7
src/makemon.c
View File

@@ -1101,8 +1101,11 @@ register int mmflags;
}
/* it's possible to create an ordinary monster of some special
types; make sure their extended data is initialized to
something sensible (caller can override these settings) */
if (mndx == PM_ALIGNED_PRIEST || (mndx == PM_ANGEL && !rn2(3))) {
something sensible if caller hasn't specified MM_EPRI|MM_EMIN
(when they're specified, caller intends to handle this itself) */
if ((mndx == PM_ALIGNED_PRIEST || mndx == PM_HIGH_PRIEST) ?
!(mmflags && (MM_EPRI|MM_EMIN)) :
(mndx == PM_ANGEL && !(mmflags && MM_EMIN) && !rn2(3))) {
struct emin *eminp;
newemin(mtmp);
eminp = EMIN(mtmp);