--- deliantra/server/include/util.h	2007/08/06 10:54:12	1.54
+++ deliantra/server/include/util.h	2007/12/16 02:50:33	1.59
@@ -1,9 +1,9 @@
 /*
- * 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
  * 
- * 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.
@@ -16,7 +16,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>
  */
 
 #ifndef UTIL_H__
@@ -174,6 +174,8 @@
   return ((d - 1) & 7) + 1;
 }
 
+extern size_t slice_alloc; // statistics
+
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
 {
@@ -185,21 +187,25 @@
 
   void *operator new (size_t s)
   {
+    slice_alloc += s;
     return g_slice_alloc0 (s);
   }
 
   void *operator new[] (size_t s)
   {
+    slice_alloc += s;
     return g_slice_alloc0 (s);
   }
 
   void operator delete (void *p, size_t s)
   {
+    slice_alloc -= s;
     g_slice_free1 (s, p);
   }
 
   void operator delete[] (void *p, size_t s)
   {
+    slice_alloc -= s;
     g_slice_free1 (s, p);
   }
 };
@@ -227,6 +233,7 @@
 #ifdef PREFER_MALLOC
   free (ptr);
 #else
+  slice_alloc -= n * sizeof (T);
   g_slice_free1 (n * sizeof (T), (void *)ptr);
 #endif
 }
@@ -347,6 +354,7 @@
   refcnt_base () : refcnt (0) { }
 };
 
+// to avoid branches with more advanced compilers
 extern refcnt_base::refcnt_t refcnt_dummy;
 
 template<class T>
@@ -541,13 +549,13 @@
 
 typedef double tstamp;
 
-// return current time as timestampe
+// return current time as timestamp
 tstamp now ();
 
 int similar_direction (int a, int b);
 
-// like printf, but returns a std::string
-const std::string format (const char *format, ...);
+// like sprintf, but returns a "static" buffer
+const char *format (const char *format, ...);
 
 #endif