[ViewVC] Diff of: cvs/deliantra/server/common/utils.C

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.15 by root, Thu Sep 14 22:34:00 2006 UTC vs.
Revision 1.23 by root, Sat Dec 16 03:08:25 2006 UTC

 #include <global.h>
 #include <funcpoint.h>
 #include <material.h>
+#include <sys/time.h>
+#include <time.h>
 #include <glib.h>
 /*
  * The random functions here take luck into account when rolling random
  * dice or numbers.  This function has less of an impact the larger the
   diff = max - min + 1;
   ((diff > 2) ? (base = 20) : (base = 50));     /* d2 and d3 are corner cases */
   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);
+      LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max);
-#endif
       return (min);             /* avoids a float exception */
     }
   /* Don't know of a portable call to get 64 bit random values.
    * So make a call to get two 32 bit random numbers, and just to
 }
 /* decay and destroy persihable items in a map */
 void
-decay_objects (mapstruct *m)
+decay_objects (maptile *m)
 {
   int x, y, destroy;
   object *op, *otmp;
   if (m->unique)
               if (op->material & M_ICE && MAP_TEMP (m) > 32)
                 destroy = 1;
             }
           /* adjust overall chance below */
           if (destroy && rndm (0, 1))
-            {
+            op->destroy ();
-              remove_ob (op);
-              free_object (op);
-            }
         }
 }
 /* convert materialname to materialtype_t */
   return;
 }
 /////////////////////////////////////////////////////////////////////////////
+#if 0
+refcounted *refcounted::rc_first;
+refcounted::refcounted ()
+{
+  refcnt   = 0;
+  rc_next  = rc_first;
+  rc_first = this;
+}
+refcounted::~refcounted ()
+{
+  assert (!rc_next);
+  assert (!refcnt);
+}
+#endif
-void *alloc (int s) throw (std::bad_alloc)
+void *salloc (int size) throw (std::bad_alloc)
 {
-  void *p = g_slice_alloc (s);
+  void *ptr = g_slice_alloc (size);
-  if (!p)
+  if (!ptr)
     throw std::bad_alloc ();
-  return p;
+  return ptr;
+}
+void *salloc (int size, void *src) throw (std::bad_alloc)
+{
+  void *ptr = salloc (size);
+  memcpy (ptr, src, size);
+  return ptr;
 }
 void assign (char *dst, const char *src, int maxlen)
 {
   if (!src)
     }
   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);
+}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/utils.C (file contents): Revision 1.15 by root, Thu Sep 14 22:34:00 2006 UTC vs. Revision 1.23 by root, Sat Dec 16 03:08:25 2006 UTC

Diff Legend

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.15 by root, Thu Sep 14 22:34:00 2006 UTC vs.
Revision 1.23 by root, Sat Dec 16 03:08:25 2006 UTC