--- deliantra/server/common/image.C	2007/04/12 14:18:04	1.23
+++ deliantra/server/common/image.C	2007/11/08 19:43:23	1.29
@@ -1,25 +1,24 @@
 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program is free software; you can redistribute it and/or modify
+ * Deliantra 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
+ * the Free Software Foundation, either version 3 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
+ * 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>
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #include <global.h>
@@ -97,10 +96,16 @@
 }
 
 facedata *
+faceinfo::data (int faceset) const
+{
+  return (facedata *)&(faceset && !type && data64.data.size () ? data64 : data32);
+}
+
+facedata *
 face_data (faceidx idx, int faceset)
 {
   if (faceinfo *f = face_info (idx))
-    return &(faceset ? f->data32 : f->data64);
+    return f->data (faceset);
 
   return 0;
 }