--- deliantra/server/include/face.h	2009/11/15 18:03:59	1.31
+++ deliantra/server/include/face.h	2011/04/23 04:56:48	1.36
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -31,13 +31,17 @@
 
 typedef uint16 faceidx;
 
-extern faceidx blank_face, empty_face;
+extern faceidx blank_face, empty_face, magicmouth_face;
 
 struct facedata
 {
   std::string data;
   uint8 chksum[CHKSUM_MAXLEN];
   uint8 chksum_len;
+
+  facedata ()
+  : chksum_len (0)
+  { }
 };
 
 /* New face structure - this enforces the notion that data is face by
@@ -53,7 +57,7 @@
 
   shstr name;
   std::string meta;
-  facedata data32, data64;      // either 32/64 face or data32 == generic resource
+  facedata face[3];             // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text
   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 */