--- deliantra/server/include/shstr.h	2009/10/12 14:00:58	1.33
+++ deliantra/server/include/shstr.h	2010/03/26 01:04:44	1.38
@@ -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
@@ -35,14 +35,16 @@
 template<int size>
 struct shstr_vec
 {
+  uint32_t hash;
   uint32_t len;
   uint32_t refcnt;
-  char string[size];
+  // pointer points here
+  char string [size];
 };
 
 // this class is a non-refcounted shared string
 // it cannot be used to create or store shared strings, but
-// it can be used to apss shared strings around, i.e. as function arguments
+// it can be used to pass shared strings around, i.e. as function arguments
 // or return values. their lifetime must not span a gc () call, i.e.
 // they are only valid as temporary values within the same server tick.
 struct shstr_tmp
@@ -52,6 +54,16 @@
 
   const char *s;
 
+  static unsigned int &hash (const char *s)
+  {
+    return *((unsigned int *)s - 3);
+  }
+
+  int hash () const
+  {
+    return hash (s);
+  }
+
   static unsigned int &length (const char *s)
   {
     return *((unsigned int *)s - 2);
@@ -130,7 +142,7 @@
   return sh.length ();
 }
 
-static std::ostream &operator <<(std::ostream &o, shstr_tmp sh)
+static inline std::ostream &operator <<(std::ostream &o, shstr_tmp sh)
 {
   o.write (sh.s, sh.length ());