Merge branch 'NetHack-3.6'

This commit is contained in:
nhmall
2019-06-02 16:19:53 -04:00
4 changed files with 28 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 dungeon.c $NHDT-Date: 1558853012 2019/05/26 06:43:32 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.94 $ */
/* NetHack 3.6 dungeon.c $NHDT-Date: 1559476918 2019/06/02 12:01:58 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.95 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1185,6 +1185,13 @@ void
u_on_newpos(x, y)
int x, y;
{
if (!isok(x, y)) { /* validate location */
void VDECL((*func), (const char *, ...)) PRINTF_F(1, 2);
func = (x < 0 || y < 0 || x > COLNO - 1 || y > ROWNO - 1) ? panic
: impossible;
(*func)("u_on_newpos: trying to place hero off map <%d,%d>", x, y);
}
u.ux = x;
u.uy = y;
#ifdef CLIPPING