--- deliantra/server/include/map.h	2007/01/15 00:40:49	1.52
+++ deliantra/server/include/map.h	2007/01/19 17:50:11	1.55
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at crossfire@schmorp.de
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at crossfire@schmorp.de
+ */
 
 /*
  * The maptile is allocated each time a new map is opened.
@@ -85,7 +85,7 @@
  * should almost always be using out_of_map instead, which takes into account
  * map tiling.
  */
-#define OUT_OF_REAL_MAP(M,X,Y) ((X)<0 || (Y)<0 || (X)>=(M)->width || (Y)>=(M)->height)
+#define OUT_OF_REAL_MAP(M,X,Y) !(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))
 
 /* These are used in the MapLook flags element.  They are not used in
  * in the object flags structure.
@@ -127,7 +127,7 @@
 struct mapspace
 {
   object *bot, *top;            /* lowest/highest object on this space */
-  New_Face *faces[MAP_LAYERS];  /* faces for the 3 layers */
+  facetile *faces[MAP_LAYERS];  /* faces for the 3 layers */
   object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
   uint8 flags_;                 /* flags about this space (see the P_ values above) */
   sint8 light;                  /* How much light this space provides */