[ViewVC] Diff of: cvs/deliantra/server/include/object.h

Comparing deliantra/server/include/object.h (file contents):
Revision 1.29 by root, Mon Sep 11 23:33:29 2006 UTC vs.
Revision 1.30 by root, Tue Sep 12 01:09:53 2006 UTC

   // fully recursive iterator
   struct iterator_base
   {
     object *item;
-    iterator_base (object *item)
+    iterator_base (object *container)
-    : item(item)
+    : item (container)
     {
     }
     operator object *() const { return item; }
     object *operator ->() const { return  item; }
     object &operator * () const { return *item; }
   };
+  // depth-first recursive iterator
-  struct deep_iterator : iterator_base
+  struct depth_iterator : iterator_base
   {
-    deep_iterator (object *op) : iterator_base (op) { }
+    depth_iterator (object *container);
     void next ();
     object *operator ++(   ) { next (); return item; }
     object *operator ++(int) { object *i = item; next (); return i; }
   };
   object *begin ()
   {
-    return this->inv ? this->inv : end ();
+    return this;
   }
   object *end ()
   {
-    return this->below;
+    return this;
   }
 protected:
   friend struct archetype;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines