[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.34 by root, Tue Sep 12 01:09:53 2006 UTC

 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <object.h>
 #include <funcpoint.h>
-#include <skills.h>
 #include <loader.h>
 int nrofallocobjects = 0;
 object *objects;                /* Pointer to the list of used objects */
   shstr key_ (key);
   return set_ob_key_value_s (op, key_, value, add_key);
 }
+object::depth_iterator::depth_iterator (object *container)
+: iterator_base (container)
+{
+  while (item->inv)
+    item = item->inv;
+}
 void
-object::deep_iterator::next ()
+object::depth_iterator::next ()
 {
-  if (item->inv)
-    item = item->inv;
-  else if (item->below)
+  if (item->below)
+    {
-    item = item->below;
+      item = item->below;
+      while (item->inv)
+        item = item->inv;
+    }
   else
-    item = item->env->below;
+    item = item->env;
 }

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