--- deliantra/server/common/shstr.C	2006/09/10 16:00:23	1.13
+++ deliantra/server/common/shstr.C	2007/05/28 21:21:40	1.23
@@ -1,3 +1,24 @@
+/*
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * 
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
 
 /*
  * shstr.C
@@ -5,31 +26,21 @@
 
 #include <cstring>
 #include <cstdlib>
-
 #include <glib.h>
-
 #include <tr1/unordered_set>
 
-#include "shstr.h"
-#include "util.h"
+#include "global.h"
 
-typedef
-std::tr1::unordered_set < const char *,
-  str_hash,
-  str_equal >
-  HT;
+typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
 
-static HT
-  ht;
+static HT ht;
 
 static const char *
 makevec (const char *s)
 {
-  int
-    len = strlen (s);
+  int len = strlen (s);
 
-  const char *
-    v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1));
+  const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
 
   shstr::length (v) = len;
   shstr::refcnt (v) = 1;
@@ -39,11 +50,15 @@
   return v;
 }
 
-const char *
-  shstr::null = makevec ("<nil>");
+static const char *
+makenull ()
+{
+  const char *s = makevec ("(null)");
+  shstr::length (s) = 0;
+  return s;
+}
 
-// what weird misoptimisation is this again?
-const shstr undead_name ("undead");
+const char *shstr::null = makenull ();
 
 const char *
 shstr::find (const char *s)
@@ -51,7 +66,7 @@
   if (!s)
     return s;
 
-  HT::iterator i = ht.find (s);
+  auto (i, ht.find (s));
 
   return i != ht.end ()? *i : 0;
 }
@@ -80,7 +95,7 @@
 {
   static const char *curpos;
 
-  HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
+  auto (i, curpos ? ht.find (curpos) : ht.begin ());
 
   if (i == ht.end ())
     i = ht.begin ();
@@ -99,7 +114,7 @@
         break;
       else if (!refcnt (*i))
         {
-          HT::iterator o = i++;
+          auto (o, i++);
           const char *s = *o;
 
           ht.erase (o);
@@ -114,12 +129,16 @@
   curpos = *i;
 }
 
+shstr skill_names[NUM_SKILLS];
+
+// what weird misoptimisation is this again?
+const shstr undead_name ("undead");
+
 //TODO: this should of course not be here
 
 /* buf_overflow() - we don't want to exceed the buffer size of 
  * buf1 by adding on buf2! Returns true if overflow will occur.
  */
-
 int
 buf_overflow (const char *buf1, const char *buf2, int bufsize)
 {
@@ -131,5 +150,6 @@
     len2 = strlen (buf2);
   if ((len1 + len2) >= bufsize)
     return 1;
+
   return 0;
 }