--- deliantra/server/include/face.h	2009/11/06 13:03:34	1.29
+++ deliantra/server/include/face.h	2010/01/16 00:08:33	1.32
@@ -26,7 +26,7 @@
 #include <string>
 #include <tr1/unordered_map>
 
-#define CHKSUM_SIZE 6
+#define CHKSUM_MAXLEN 15
 #define MAX_FACES 10000 // stupid gcfclient artificially limits
 
 typedef uint16 faceidx;
@@ -36,7 +36,12 @@
 struct facedata
 {
   std::string data;
-  uint8 chksum[CHKSUM_SIZE];
+  uint8 chksum[CHKSUM_MAXLEN];
+  uint8 chksum_len;
+
+  facedata ()
+  : chksum_len (0)
+  { }
 };
 
 /* New face structure - this enforces the notion that data is face by
@@ -65,9 +70,12 @@
 };
 
 inline void
-object_freezer::put (keyword k, faceinfo *v)
+object_freezer::put (const keyword_string k, faceinfo *v)
 {
-  put (k, v ? &v->name : (const char *)0);
+  if (expect_true (v))
+    put (k, v->name);
+  else
+    put (k);
 }
 
 typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;