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

fix monster summoning message

Browse Source 
From a bug report:
> If the Summon Nasties monster spell gates in two minions instead of one,
> the message still says "A monster appears from nowhere!"

The code wasn't counting any summoned monsters who had an opposite alignment
to the summoner.  It also assumed that the 10% chance for demon summoning
in Gehennom always yielded exactly one monster even though that can produce
zero or more than one.
This commit is contained in:
nethack.rankin
2004-12-21 04:27:34 +00:00
parent 38f9ba9a91
commit 3f2aa875bb
5 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/wizard.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)wizard.c 3.4 2003/02/18 */
/* SCCS Id: @(#)wizard.c 3.4 2004/12/20 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -416,14 +416,14 @@ nasty(mcast)
{
register struct monst *mtmp;
register int i, j, tmp;
int castalign = (mcast ? mcast->data->maligntyp : -1);
int castalign = (mcast ? sgn(mcast->data->maligntyp) : -1);
coord bypos;
int count=0;
int count;
if(!rn2(10) && Inhell) {
msummon((struct monst *) 0); /* summons like WoY */
count++;
count = msummon((struct monst *) 0); /* summons like WoY */
} else {
count = 0;
tmp = (u.ulevel > 3) ? u.ulevel/3 : 1; /* just in case -- rph */
/* if we don't have a casting monster, the nasties appear around you */
bypos.x = u.ux;
@@ -450,10 +450,11 @@ nasty(mcast)
} else /* GENOD? */
mtmp = makemon((struct permonst *)0,
bypos.x, bypos.y, NO_MM_FLAGS);
if(mtmp && (mtmp->data->maligntyp == 0 ||
sgn(mtmp->data->maligntyp) == sgn(castalign)) ) {
if (mtmp) {
count++;
break;
if (mtmp->data->maligntyp == 0 ||
sgn(mtmp->data->maligntyp) == castalign)
break;
}
}
}