--- deliantra/server/common/shstr.C	2009/10/12 14:00:57	1.39
+++ deliantra/server/common/shstr.C	2010/04/15 00:36:51	1.44
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 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
@@ -38,16 +38,19 @@
 static HT ht;
 static int next_gc;
 
+#define NUM_INT 3
+
 static const char *
 makevec (const char *s)
 {
   int len = strlen (s);
-  int alloc = sizeof (uint32_t) * 2 + len + 1;
+  int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
 
   shstr_alloc += alloc;
   char *v = (char *)g_slice_alloc (alloc);
-  v += sizeof (uint32_t) * 2;
+  v += sizeof (uint32_t) * NUM_INT;
 
+  shstr::hash   (v) = strhsh (s);
   shstr::length (v) = len;
   shstr::refcnt (v) = 1;
 
@@ -56,7 +59,7 @@
   return v;
 }
 
-shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
+shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
 
 const char *
 shstr::find (const char *s)
@@ -122,9 +125,9 @@
           ht.erase (o);
 
           //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
-          int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
+          int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
           shstr_alloc -= alloc;
-          g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
+          g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
         }
       else
         ++i;
@@ -140,26 +143,5 @@
 #undef def
 #undef def2
 
-shstr skill_names[NUM_SKILLS];
-
-//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)
-{
-  int len1 = 0, len2 = 0;
+materialtype_t material_null;
 
-  if (buf1)
-    len1 = strlen (buf1);
-
-  if (buf2)
-    len2 = strlen (buf2);
-
-  if ((len1 + len2) >= bufsize)
-    return 1;
-
-  return 0;
-}