--- deliantra/server/common/utils.C	2006/09/10 16:00:23	1.9
+++ deliantra/server/common/utils.C	2006/12/17 23:10:34	1.25
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcsid_utils_c =
- *   "$Id: utils.C,v 1.9 2006/09/10 16:00:23 root Exp $";
- */
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -24,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 /*
@@ -35,6 +29,8 @@
 #include <funcpoint.h>
 #include <material.h>
 
+#include <sys/time.h>
+#include <time.h>
 #include <glib.h>
 
 /*
@@ -105,11 +101,7 @@
 
   if (max < 1 || diff < 1)
     {
-#ifndef WIN32
-      LOG (llevError, "Calling random_roll with min=%lld max=%lld\n", min, max);
-#else
-      LOG (llevError, "Calling random_roll with min=%I64d max=%I64d\n", min, max);
-#endif
+      LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max);
       return (min);             /* avoids a float exception */
     }
 
@@ -208,7 +200,7 @@
 /* decay and destroy persihable items in a map */
 
 void
-decay_objects (mapstruct *m)
+decay_objects (maptile *m)
 {
   int x, y, destroy;
   object *op, *otmp;
@@ -266,10 +258,7 @@
             }
           /* adjust overall chance below */
           if (destroy && rndm (0, 1))
-            {
-              remove_ob (op);
-              free_object (op);
-            }
+            op->destroy ();
         }
 }
 
@@ -533,6 +522,7 @@
   /*trim all trailing commas, spaces etc. */
   for (i = strlen (tmp); !isalnum (tmp[i]) && i >= 0; i--)
     tmp[i] = '\0';
+
   strcat (tmp, ".");
 
   p = strrchr (tmp, ',');
@@ -546,37 +536,80 @@
     }
   else
     strcpy (input, tmp);
+
   return;
 }
 
-void *
-  zero_initialised::operator
-new (size_t s)
+/////////////////////////////////////////////////////////////////////////////
+
+#if 0
+refcounted *refcounted::rc_first;
+
+refcounted::refcounted ()
 {
-  //return calloc (1, s);
-  return g_slice_alloc0 (s);
+  refcnt   = 0;
+  rc_next  = rc_first;
+  rc_first = this;
 }
 
-void *
-  zero_initialised::operator
-new[] (size_t s)
+refcounted::~refcounted ()
 {
-  //return calloc (1, s);
-  return g_slice_alloc0 (s);
+  assert (!rc_next);
+  assert (!refcnt);
 }
+#endif
 
-void
-  zero_initialised::operator
-delete (void *p, size_t s)
+void *salloc_ (int n) throw (std::bad_alloc)
 {
-  //free (p); return;
-  g_slice_free1 (s, p);
+  void *ptr = g_slice_alloc (n);
+
+  if (!ptr)
+    throw std::bad_alloc ();
+
+  return ptr;
 }
 
-void
-  zero_initialised::operator
-delete[] (void *p, size_t s)
+void *salloc_ (int n, void *src) throw (std::bad_alloc)
+{
+  void *ptr = salloc_ (n);
+
+  if (src)
+    memcpy (ptr, src, n);
+  else
+    memset (ptr, 0, n);
+
+  return ptr;
+}
+
+void assign (char *dst, const char *src, int maxlen)
 {
-  //free (p); return;
-  g_slice_free1 (s, p);
+  if (!src)
+    src = "";
+
+  int len = strlen (src);
+
+  if (len >= maxlen - 1)
+    {
+      if (maxlen <= 4)
+        {
+          memset (dst, '.', maxlen - 1);
+          dst [maxlen - 1] = 0;
+        }
+      else
+        {
+          memcpy (dst, src, maxlen - 4);
+          memcpy (dst + maxlen - 4, "...", 4);
+        }
+    }
+  else
+    memcpy (dst, src, len + 1);
 }
+
+tstamp now ()
+{
+  struct timeval tv;
+
+  gettimeofday (&tv, 0);
+  return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6);
+}
+