--- deliantra/server/include/face.h	2007/07/12 08:40:14	1.19
+++ deliantra/server/include/face.h	2007/11/08 14:15:56	1.23
@@ -46,6 +46,11 @@
  */
 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
@@ -57,9 +62,7 @@
   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
@@ -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);