--- deliantra/server/include/face.h	2009/11/06 13:03:34	1.29
+++ deliantra/server/include/face.h	2012/01/04 02:48:57	1.39
@@ -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,2012 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
@@ -23,20 +23,25 @@
 #ifndef FACE_H__
 #define FACE_H__
 
-#include <string>
+#include <util.h>
 #include <tr1/unordered_map>
 
-#define CHKSUM_SIZE 6
+#define CHKSUM_MAXLEN 15
 #define MAX_FACES 10000 // stupid gcfclient artificially limits
 
 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_SIZE];
+  refcnt_buf data; // no need to be refcounted actually
+  uint8 chksum[CHKSUM_MAXLEN];
+  uint8 chksum_len;
+
+  facedata ()
+  : chksum_len (0)
+  { }
 };
 
 /* New face structure - this enforces the notion that data is face by
@@ -46,13 +51,13 @@
 struct faceinfo
 {
   faceinfo ()
-  : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
+  : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0), refcnt (1), meta_hv (0)
   {
   }
 
   shstr name;
-  std::string meta;
-  facedata data32, data64;      // either 32/64 face or data32 == generic resource
+  HV *meta_hv; /* note, no destructor of copy constructor, must never be freed, but can be moved aorund */
+  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 */
@@ -62,12 +67,19 @@
   uint8 magicmap;		/* Color to show this in magic map */
 
   facedata *data (int faceset) const;
+
+  int refcnt; // reference count - 1
+  void ref () { ++refcnt; }
+  void unref ();
 };
 
 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;
@@ -86,6 +98,7 @@
  * it will be known that the face could not be found.
  */
 faceidx face_find (const char *name, faceidx defidx = 0);
+faceidx face_alloc ();
 faceinfo *face_info (faceidx idx);
 facedata *face_data (faceidx idx, int faceset);