--- deliantra/server/common/shstr.C	2008/12/31 17:35:37	1.32
+++ deliantra/server/common/shstr.C	2009/01/01 21:15:12	1.38
@@ -41,28 +41,21 @@
 makevec (const char *s)
 {
   int len = strlen (s);
+  int alloc = sizeof (uint32_t) * 2 + len + 1;
 
-  shstr_alloc += sizeof (unsigned int) * 2 + len + 1;
-  const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (unsigned int) * 2 + len + 1));
+  shstr_alloc += alloc;
+  char *v = (char *)g_slice_alloc (alloc);
+  v += sizeof (uint32_t) * 2;
 
   shstr::length (v) = len;
   shstr::refcnt (v) = 1;
 
-  memcpy ((char *) v, s, len + 1);
+  memcpy (v, s, len + 1);
 
   return v;
 }
 
-static const char *
-makenull ()
-{
-  const char *s = makevec ("(null)");
-  shstr_tmp::length (s) = 0;
-  //shstr    ::refcnt (s) = 0xffffffff; // useful for debugging
-  return s;
-}
-
-const char *shstr_tmp::null = makenull ();
+shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
 
 const char *
 shstr::find (const char *s)
@@ -79,7 +72,7 @@
 shstr::intern (const char *s)
 {
   if (!s)
-    return null;
+    return null ();
 
   if (const char *found = find (s))
     {
@@ -128,8 +121,9 @@
           ht.erase (o);
 
           //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
-          shstr_alloc -= sizeof (unsigned int) * 2 + length (s) + 1;
-          g_slice_free1 (sizeof (unsigned int) * 2 + length (s) + 1, -2 + (int *) s);
+          int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
+          shstr_alloc -= alloc;
+          g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
         }
       else
         ++i;
@@ -138,12 +132,12 @@
   curpos = *i;
 }
 
-const shstr shstr_null;
-
 // declare these here to get correct initialisation order
-#define def(str) const shstr shstr_ ## str (# str);
+#define def2(id,str) const shstr id (str);
+#define def(id)      def2(shstr_ ## id, # id)
 # include "shstrinc.h"
 #undef def
+#undef def2
 
 shstr skill_names[NUM_SKILLS];