--- deliantra/server/include/util.h	2006/09/12 20:55:40	1.11
+++ deliantra/server/include/util.h	2006/12/30 10:16:10	1.25
@@ -8,9 +8,17 @@
 #endif
 
 #include <cstddef>
+#include <new>
+#include <vector>
 
 #include <glib.h>
 
+#include <shstr.h>
+#include <traits.h>
+
+// use a gcc extension for auto declarations until ISO C++ sanctifies them
+#define AUTODECL(var,expr) typeof(expr) var = (expr)
+
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
 {
@@ -41,10 +49,28 @@
   }
 };
 
-void throw_bad_alloc () throw (std::bad_alloc);
+void *salloc_ (int n)            throw (std::bad_alloc);
+void *salloc_ (int n, void *src) throw (std::bad_alloc);
 
-void *alloc (int s) throw (std::bad_alloc);
-void dealloc (void *p, int s) throw ();
+// strictly the same as g_slice_alloc, but never returns 0
+template<typename T>
+inline T *salloc (int n = 1)     throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T));              }
+
+// also copies src into the new area, like "memdup"
+// if src is 0, clears the memory
+template<typename T>
+inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
+
+// clears the memory
+template<typename T>
+inline T *salloc0(int n = 1)     throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0);           }
+
+// for symmetry
+template<typename T>
+inline void sfree (T *ptr, int n = 1) throw ()
+{
+  g_slice_free1 (n * sizeof (T), (void *)ptr);
+}
 
 // a STL-compatible allocator that uses g_slice
 // boy, this is verbose
@@ -77,12 +103,12 @@
 
   pointer allocate (size_type n, const_pointer = 0)
   {
-    return static_cast<pointer>(alloc (n * sizeof (Tp)));
+    return salloc<Tp> (n);
   }
 
   void deallocate (pointer p, size_type n)
   {
-    dealloc (static_cast<void *>(p), n);
+    sfree<Tp> (p, n);
   }
 
   size_type max_size ()const throw ()
@@ -101,15 +127,6 @@
   }
 };
 
-struct refcounted
-{
-  mutable int refcnt;
-  refcounted () : refcnt (0) { }
-  void refcnt_inc () { ++refcnt; }
-  void refcnt_dec () { --refcnt;
-  if (refcnt < 0)abort();}//D
-};
-
 template<class T>
 struct refptr
 {
@@ -141,6 +158,12 @@
   operator T *() const { return p; }
 };
 
+typedef refptr<maptile>   maptile_ptr;
+typedef refptr<object>    object_ptr;
+typedef refptr<archetype> arch_ptr;
+typedef refptr<client>    client_ptr;
+typedef refptr<player>    player_ptr;
+
 struct str_hash
 {
   std::size_t operator ()(const char *s) const
@@ -175,8 +198,6 @@
   }
 };
 
-#include <vector>
-
 template<class obj>
 struct unordered_vector : std::vector<obj, slice_allocator<obj> >
 {
@@ -212,5 +233,12 @@
   assign ((char *)&dst, src, N);
 }
 
+typedef double tstamp;
+
+// return current time as timestampe
+tstamp now ();
+
+int similar_direction (int a, int b);
+
 #endif