--- deliantra/server/include/util.h	2007/06/02 03:48:29	1.47
+++ deliantra/server/include/util.h	2007/06/04 12:19:08	1.48
@@ -63,7 +63,7 @@
 // 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)
+#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
 
 // in range including end
 #define IN_RANGE_INC(val,beg,end) \
@@ -429,6 +429,20 @@
 template<class T, int T::* index>
 struct object_vector : std::vector<T *, slice_allocator<T *> >
 {
+  typedef typename object_vector::iterator iterator;
+
+  bool contains (const T *obj) const
+  {
+    return obj->*index;
+  }
+
+  iterator find (const T *obj)
+  {
+    return obj->*index
+      ? this->begin () + obj->*index - 1
+      : this->end ();
+  }
+
   void insert (T *obj)
   {
     assert (!(obj->*index));