--- deliantra/server/include/face.h	2007/07/01 05:00:18	1.18
+++ deliantra/server/include/face.h	2008/07/29 02:00:55	1.26
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 1994,2007 Mark Wedel
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT 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 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #ifndef FACE_H__
@@ -46,20 +46,23 @@
  */
 struct faceinfo
 {
+  faceinfo ()
+  : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
+  {
+  }
+
   shstr name;
   std::string meta;
   facedata data32, data64;      // either 32/64 face or data32 == generic resource
   faceidx number;		/* This is the image id.  It should be the */
                                 /* same value as its position in the array */
   faceidx smooth;               /* the smooth face for this face, or 0 */
-  uint8 type;                   // 0 normal face, 1 generic resource
+  uint8 type;                   // 0 normal face, otherwise other resource
   uint8 smoothlevel;            // smoothlevel is per-face in 2.x servers
   uint8 visibility;
   uint8 magicmap;		/* Color to show this in magic map */
 
-  faceinfo ()
-  : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
-  { }
+  facedata *data (int faceset) const;
 };
 
 inline void
@@ -68,7 +71,7 @@
   put (k, v ? &v->name : (const char *)0);
 }
 
-typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t;
+typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
 
 extern facehash_t facehash;
 extern std::vector<faceinfo> faces;
@@ -97,11 +100,11 @@
 
 struct animation
 {
-  shstr name;			/* Name of the animation sequence */
-  animidx number;
-  uint8 num_animations;		/* How many different faces to animate */
-  uint8 facings;		/* How many facings (1,2,4,8) */
   faceidx *faces;		/* The different animations */
+  int num_animations;		/* How many different faces to animate */
+  sint8 facings;		/* How many facings (1,2,4,8) */
+  animidx number;
+  shstr name;			/* Name of the animation sequence */
 
   static animation &create (const char *name, uint8 frames, uint8 facings = 1);
   static animation &find (const char *name);
@@ -109,7 +112,7 @@
   void resize (int new_size);
 };
 
-typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> animhash_t;
+typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
 
 extern animhash_t animhash;
 extern std::vector<animation> animations;