--- deliantra/server/common/utils.C	2007/08/16 06:36:56	1.65
+++ deliantra/server/common/utils.C	2008/02/01 15:54:07	1.71
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra 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 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /*
@@ -39,7 +39,7 @@
 #include <glib.h>
 
 refcnt_base::refcnt_t refcnt_dummy;
-
+size_t slice_alloc;
 rand_gen rndm;
 
 void
@@ -474,6 +474,7 @@
 #ifdef PREFER_MALLOC
   void *ptr = malloc (n);
 #else
+  slice_alloc += n;
   void *ptr = g_slice_alloc (n);
 #endif
 
@@ -495,6 +496,46 @@
   return ptr;
 }
 
+/******************************************************************************/
+
+#ifdef DEBUG_SALLOC
+
+#define MAGIC 0xa1b2c35543deadLL
+
+void *g_slice_alloc (unsigned long size)
+{
+  unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long));
+  *p++ = size ^ MAGIC;
+  //fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D
+  return (void *)p;
+}
+
+void *g_slice_alloc0 (unsigned long size)
+{
+  return memset (g_slice_alloc (size), 0, size);
+}
+
+void g_slice_free1 (unsigned long size, void *ptr)
+{
+  if (expect_true (ptr))
+    {
+      //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
+      unsigned long *p = (unsigned long *)ptr;
+      unsigned long s = *--p ^ MAGIC;
+
+      if (size != (unsigned long)(*p ^ MAGIC))
+        LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
+
+      *p = MAGIC;
+
+      (g_slice_free1)(s + sizeof (unsigned long), p);
+    }
+}
+
+#endif
+
+/******************************************************************************/
+
 void assign (char *dst, const char *src, int maxlen)
 {
   if (!src)
@@ -609,12 +650,3 @@
     0x2d02ef8dL
 };
 
-#if 0
-void xyzzy (object_ptr &a, object_ptr &o)
-{
-  asm volatile ("int3");
-  a = o;
-  asm volatile ("int3");
-}
-#endif
-