--- deliantra/server/include/util.h	2006/12/17 19:07:23	1.19
+++ deliantra/server/include/util.h	2006/12/30 10:16:10	1.25
@@ -8,9 +8,14 @@
 #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)
 
@@ -44,23 +49,27 @@
   }
 };
 
+void *salloc_ (int n)            throw (std::bad_alloc);
+void *salloc_ (int n, void *src) throw (std::bad_alloc);
+
 // strictly the same as g_slice_alloc, but never returns 0
-void *salloc (int size)                throw (std::bad_alloc);
+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
-void *salloc (int size, void *src)     throw (std::bad_alloc);
-
-// and as a template
 template<typename T>
-inline T *salloc (int size)            throw (std::bad_alloc) { return (T *)salloc (size * sizeof (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 *salloc (int size, T *src)    throw (std::bad_alloc) { return (T *)salloc (size * sizeof (T), (void *)src); }
+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 size) throw ()
+inline void sfree (T *ptr, int n = 1) throw ()
 {
-  g_slice_free1 (size * sizeof (T), (void *)ptr);
+  g_slice_free1 (n * sizeof (T), (void *)ptr);
 }
 
 // a STL-compatible allocator that uses g_slice
@@ -118,21 +127,6 @@
   }
 };
 
-struct refcounted
-{
-  refcounted () : refcnt (0) { }
-//  virtual ~refcounted ();
-  void refcnt_inc () { ++refcnt; }
-  void refcnt_dec () { --refcnt; }
-  bool dead () { return refcnt == 0; }
-  mutable int refcnt;
-#if 0
-private:
-  static refcounted *rc_first;
-  refcounted *rc_next;
-#endif
-};
-
 template<class T>
 struct refptr
 {
@@ -164,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
@@ -198,8 +198,6 @@
   }
 };
 
-#include <vector>
-
 template<class obj>
 struct unordered_vector : std::vector<obj, slice_allocator<obj> >
 {
@@ -240,5 +238,7 @@
 // return current time as timestampe
 tstamp now ();
 
+int similar_direction (int a, int b);
+
 #endif