--- deliantra/server/common/image.C	2007/01/10 19:52:43	1.11
+++ deliantra/server/common/image.C	2007/01/19 17:50:10	1.13
@@ -1,32 +1,32 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2002 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 maintainer of this code can be reached at <crossfire@schmorp.de>
-*/
+ * CrossFire, A Multiplayer game
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2002 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 maintainer of this code can be reached at <crossfire@schmorp.de>
+ */
 
 
 #include <global.h>
 #include <stdio.h>
 
-New_Face *new_faces;
+facetile *new_faces;
 
 /* bmappair and xbm are used when looking for the image id numbers
  * of a face by name.  xbm is sorted alphabetically so that bsearch
@@ -53,7 +53,7 @@
 /* Following can just as easily be pointers, but 
  * it is easier to keep them like this.
  */
-New_Face *blank_face, *dark_faces[3], *empty_face, *smooth_face;
+facetile *blank_face, *dark_faces[3], *empty_face, *smooth_face;
 
 
 /* nroffiles is the actual number of bitmaps defined.
@@ -149,7 +149,7 @@
 ReadFaceData (void)
 {
   char buf[MAX_BUF], *cp;
-  New_Face *on_face = NULL;
+  facetile *on_face = NULL;
   FILE *fp;
 
   sprintf (buf, "%s/faces", settings.datadir);
@@ -297,7 +297,7 @@
 
   LOG (llevDebug, "done (got %d/%d/%d)\n", nrofpixmaps, nrofbmaps, nroffiles);
 
-  new_faces = new New_Face[nrofpixmaps];
+  new_faces = new facetile[nrofpixmaps];
 
   for (i = 0; i < nrofpixmaps; i++)
     {