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

B18009 animate figurine over water

Browse Source 
>More worrying is the fact that applying a figurine over water lets
>the monster wait until its next move before it drowns (giving
>you time to teleport it to safety, or whatever) [...]
>Should there be a minliquid() check as part of make_familiar()?

Applying at the water location next to you was easy. But
applying it at your own location (triggering BY_YOU)  could
end up placing the figurine at the far side of the level if
there was lots of water.

Correcting that required the ability to pass a flag from
make_familiar to makemon() telling it to not rule out
water locations as good positions.  The flag had to
be passed on down to goodpos() and enexto().

The bulk of this patch is just adding an additional
argument to goodpos() in all of the callers.
This commit is contained in:
nethack.allison
2003-02-09 05:39:32 +00:00
parent fd22b557ed
commit c2c72d11e7
17 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/makemon.c
View File

@@ -766,6 +766,7 @@ register int mmflags;
boolean byyou = (x == u.ux && y == u.uy);
boolean allow_minvent = ((mmflags & NO_MINVENT) == 0);
boolean countbirth = ((mmflags & MM_NOCOUNTBIRTH) == 0);
unsigned gpflags = (mmflags & MM_IGNOREWATER) ? MM_IGNOREWATER : 0;
uchar lim;
/* if caller wants random location, do it here */
@@ -777,12 +778,12 @@ register int mmflags;
do {
x = rn1(COLNO-3,2);
y = rn2(ROWNO);
} while(!goodpos(x, y, ptr ? &fakemon : (struct monst *)0) ||
} while(!goodpos(x, y, ptr ? &fakemon : (struct monst *)0, gpflags) ||
(!in_mklev && tryct++ < 50 && cansee(x, y)));
} else if (byyou && !in_mklev) {
coord bypos;
if(enexto(&bypos, u.ux, u.uy, ptr)) {
if(enexto_core(&bypos, u.ux, u.uy, ptr, gpflags)) {
x = bypos.x;
y = bypos.y;
} else
@@ -819,7 +820,7 @@ register int mmflags;
return((struct monst *) 0); /* no more monsters! */
}
fakemon.data = ptr; /* set up for goodpos */
} while(!goodpos(x, y, &fakemon) && tryct++ < 50);
} while(!goodpos(x, y, &fakemon, gpflags) && tryct++ < 50);
mndx = monsndx(ptr);
}
/* if it's unique, don't ever make it again */