pull in the recent unconditionals merge from master

This commit is contained in:
Derek S. Ray
2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 rect.c $Date$ $Revision$ */
/* NetHack 3.5 rect.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 rect.c $Date: 2009/05/06 10:47:37 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)rect.c 3.5 1990/02/22 */
/* Copyright (c) 1990 by Jean-Christophe Collet */
/* NetHack may be freely redistributed. See license for details. */
@@ -136,9 +137,7 @@ add_rect(r)
NhRect *r;
{
if (rect_cnt >= MAXRECT) {
#ifdef WIZARD
if (wizard) pline("MAXRECT may be too small.");
#endif
return;
}
/* Check that this NhRect is not included in another one */