--- deliantra/server/common/shstr.C	2007/11/08 19:43:23	1.28
+++ deliantra/server/common/shstr.C	2008/04/11 21:09:52	1.29
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 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 GNU General Public License as published by
@@ -35,6 +35,7 @@
 typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
 
 static HT ht;
+static int next_gc;
 
 static const char *
 makevec (const char *s)
@@ -85,6 +86,7 @@
       return found;
     }
 
+  --next_gc;
   s = makevec (s);
   ht.insert (s);
   return s;
@@ -95,6 +97,9 @@
 void
 shstr::gc ()
 {
+  if (expect_true (next_gc > 0))
+    return;
+
   static const char *curpos;
 
   auto (i, curpos ? ht.find (curpos) : ht.begin ());
@@ -103,6 +108,7 @@
     i = ht.begin ();
 
   int n = ht.size () / 256 + 16;
+  next_gc += n >> 1;
 
   for (;;)
     {