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

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.21 by root, Tue Dec 12 20:53:02 2006 UTC vs.
Revision 1.25 by root, Sun Dec 17 23:10:34 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
               if (op->material & M_ICE && MAP_TEMP (m) > 32)
                 destroy = 1;
             }
           /* adjust overall chance below */
           if (destroy && rndm (0, 1))
-            {
-              op->remove ();
-              op->destroy (0);
+            op->destroy ();
-            }
         }
 }
 /* convert materialname to materialtype_t */
   assert (!rc_next);
   assert (!refcnt);
 }
 #endif
-void *alloc (int s) throw (std::bad_alloc)
+void *salloc_ (int n) throw (std::bad_alloc)
 {
-  void *p = g_slice_alloc (s);
+  void *ptr = g_slice_alloc (n);
-  if (!p)
+  if (!ptr)
     throw std::bad_alloc ();
-  return p;
+  return ptr;
+}
+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)
 {
   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);
+}

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