--- deliantra/server/include/util.h	2007/05/28 21:15:56	1.46
+++ deliantra/server/include/util.h	2007/07/01 05:00:18	1.51
@@ -1,21 +1,20 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * 
- * Crossfire TRT is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
@@ -35,6 +34,10 @@
 # define prefetch(addr,rw,locality)
 #endif
 
+#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
+# define decltype(x) typeof(x)
+#endif
+
 // put into ifs if you are very sure that the expression
 // is mostly true or mosty false. note that these return
 // booleans, not the expression.
@@ -51,15 +54,15 @@
 #include <shstr.h>
 #include <traits.h>
 
-// use a gcc extension for auto declarations until ISO C++ sanctifies them
-#define auto(var,expr) typeof(expr) var = (expr)
+// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
+#define auto(var,expr) decltype(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)
+#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) \
@@ -403,6 +406,10 @@
   }
 };
 
+// Mostly the same as std::vector, but insert/erase can reorder
+// the elements, making insret/remove O(1) instead of O(n).
+//
+// NOTE: only some forms of erase/insert are available
 template<class T>
 struct unordered_vector : std::vector<T, slice_allocator<T> >
 {
@@ -422,14 +429,41 @@
   }
 };
 
-template<class T, int T::* index>
+// This container blends advantages of linked lists
+// (efficiency) with vectors (random access) by
+// by using an unordered vector and storing the vector
+// index inside the object.
+//
+// + memory-efficient on most 64 bit archs
+// + O(1) insert/remove
+// + free unique (but varying) id for inserted objects
+// + cache-friendly iteration
+// - only works for pointers to structs
+//
+// NOTE: only some forms of erase/insert are available
+typedef int object_vector_index;
+
+template<class T, object_vector_index T::*indexmember>
 struct object_vector : std::vector<T *, slice_allocator<T *> >
 {
+  typedef typename object_vector::iterator iterator;
+
+  bool contains (const T *obj) const
+  {
+    return obj->*indexmember;
+  }
+
+  iterator find (const T *obj)
+  {
+    return obj->*indexmember
+      ? this->begin () + obj->*indexmember - 1
+      : this->end ();
+  }
+
   void insert (T *obj)
   {
-    assert (!(obj->*index));
     push_back (obj);
-    obj->*index = this->size ();
+    obj->*indexmember = this->size ();
   }
 
   void insert (T &obj)
@@ -439,14 +473,13 @@
 
   void erase (T *obj)
   {
-    assert (obj->*index);
-    unsigned int pos = obj->*index;
-    obj->*index = 0;
+    unsigned int pos = obj->*indexmember;
+    obj->*indexmember = 0;
 
     if (pos < this->size ())
       {
         (*this)[pos - 1] = (*this)[this->size () - 1];
-        (*this)[pos - 1]->*index = pos;
+        (*this)[pos - 1]->*indexmember = pos;
       }
 
     this->pop_back ();
@@ -454,7 +487,7 @@
 
   void erase (T &obj)
   {
-    errase (&obj);
+    erase (&obj);
   }
 };