pull in the recent unconditionals merge from master

src/sp_lev.c

@@ -1,4 +1,5 @@
-/* NetHack 3.5	sp_lev.c	$Date$  $Revision$ */
+/* NetHack 3.5	sp_lev.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	sp_lev.c	$Date: 2011/01/05 01:28:36 $  $Revision: 1.23 $ */
 /*	Copyright (c) 1989 by Jean-Christophe Collet */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -11,15 +12,6 @@
 
 #include "hack.h"
 #include "dlb.h"
-/* #define DEBUG */	/* uncomment to enable code debugging */
-
-#ifdef DEBUG
-# ifdef WIZARD
-#define debugpline	if (wizard) pline
-# else
-#define debugpline	pline
-# endif
-#endif
 
 #include "sp_lev.h"
 
@@ -332,10 +324,8 @@ chk:
 		lev = &levl[x][y];
 		for (; y <= ymax; y++) {
 			if (lev++->typ) {
-#ifdef DEBUG
 				if(!vault)
 				    debugpline("strange area [%d,%d] in check_room.",x,y);
-#endif
 				if (!rn2(3))	return FALSE;
 				if (x < *lowx)
 				    *lowx = x + xlim + 1;
@@ -408,9 +398,7 @@ xchar	rtype, rlit;
 			r1 = rnd_rect(); /* Get a random rectangle */
 
 			if (!r1) { /* No more free rectangles ! */
-#ifdef DEBUG
 				debugpline("No more rects...");
-#endif
 				return FALSE;
 			}
 			hx = r1->hx;
@@ -1323,10 +1311,8 @@ schar ftyp, btyp;
 	if (xx <= 0 || yy <= 0 || tx <= 0 || ty <= 0 ||
 	    xx > COLNO-1 || tx > COLNO-1 ||
 	    yy > ROWNO-1 || ty > ROWNO-1) {
-#ifdef DEBUG
 		debugpline("dig_corridor: bad coords : (%d,%d) (%d,%d).",
 			   xx,yy,tx,ty);
-#endif
 		return FALSE;
 	}
 	if (tx > xx)		dx = 1;