|
1 | 1 | /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
|
2 |
| -/* Last modified by Alex Smith, 2015-10-11 */ |
| 2 | +/* Last modified by Alex Smith, 2016-06-30 */ |
3 | 3 | /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
4 | 4 | /* NetHack may be freely redistributed. See license for details. */
|
5 | 5 |
|
@@ -2219,8 +2219,10 @@ mnearto(struct monst * mtmp, xchar x, xchar y, boolean move_other)
|
2219 | 2219 | /* actually we have real problems if enexto ever fails. migrating_mons
|
2220 | 2220 | that need to be placed will cause no end of trouble. */
|
2221 | 2221 | if (!enexto(&mm, level, newx, newy, mtmp->data))
|
2222 |
| - panic("Nowhere to place '%s' (at (%d, %d), wanted (%d, %d))", |
2223 |
| - k_monnam(mtmp), mtmp->mx, mtmp->my, x, y); |
| 2222 | + if (!enexto_core(&mm, level, newx, newy, mtmp->data, |
| 2223 | + MM_IGNOREWATER)) |
| 2224 | + panic("Nowhere to place '%s' (at (%d, %d), wanted (%d, %d))", |
| 2225 | + k_monnam(mtmp), mtmp->mx, mtmp->my, x, y); |
2224 | 2226 | newx = mm.x;
|
2225 | 2227 | newy = mm.y;
|
2226 | 2228 | }
|
|
0 commit comments