--- deliantra/server/include/util.h	2006/12/16 21:40:26	1.18
+++ deliantra/server/include/util.h	2007/01/15 00:40:49	1.27
@@ -8,12 +8,32 @@
 #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)
 
+// very ugly macro that basicaly declares and initialises a variable
+// that is in scope for the next statement only
+// works only for stuff that can be assigned 0 and converts to false
+// (note: works great for pointers)
+// most ugly macro I ever wrote
+#define declvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
+
+// in range including end
+#define IN_RANGE_INC(val,beg,end) \
+  ((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg))
+
+// in range excluding end
+#define IN_RANGE_EXC(val,beg,end) \
+  ((unsigned int)(val) - (unsigned int)(beg) <  (unsigned int)(end) - (unsigned int)(beg))
+
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
 {
@@ -44,23 +64,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
@@ -99,7 +123,7 @@
 
   void deallocate (pointer p, size_type n)
   {
-    sfree (p, n);
+    sfree<Tp> (p, n);
   }
 
   size_type max_size ()const throw ()
@@ -118,21 +142,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 +173,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,10 +213,8 @@
   }
 };
 
-#include <vector>
-
-template<class obj>
-struct unordered_vector : std::vector<obj, slice_allocator<obj> >
+template<class T>
+struct unordered_vector : std::vector<T, slice_allocator<T> >
 {
   typedef typename unordered_vector::iterator iterator;
 
@@ -219,6 +232,42 @@
   }
 };
 
+template<class T, int T::* index>
+struct object_vector : std::vector<T *, slice_allocator<T *> >
+{
+  void insert (T *obj)
+  {
+    assert (!(obj->*index));
+    push_back (obj);
+    obj->*index = this->size ();
+  }
+
+  void insert (T &obj)
+  {
+    insert (&obj);
+  }
+
+  void erase (T *obj)
+  {
+    assert (obj->*index);
+    int pos = obj->*index;
+    obj->*index = 0;
+
+    if (pos < this->size ())
+      {
+        (*this)[pos - 1] = (*this)[this->size () - 1];
+        (*this)[pos - 1]->*index = pos;
+      }
+
+    this->pop_back ();
+  }
+
+  void erase (T &obj)
+  {
+    errase (&obj);
+  }
+};
+
 template<typename T, typename U> static inline T min (T a, U b) { return a < (T)b ? a : (T)b; }
 template<typename T, typename U> static inline T max (T a, U b) { return a > (T)b ? a : (T)b; }
 template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? a : v >(T)b ? b : v; }
@@ -240,5 +289,7 @@
 // return current time as timestampe
 tstamp now ();
 
+int similar_direction (int a, int b);
+
 #endif