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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.111 by root, Mon Jan 8 01:19:02 2007 UTC vs.
Revision 1.114 by root, Sun Jan 14 22:06:05 2007 UTC

  * Returns the object which has the count-variable equal to the argument.
  */
 object *
 find_object (tag_t i)
 {
-  return ((unsigned int)i) < objects.size ()
+  for_all_objects (op)
-    ? objects [i]
+   if (op->count == i)
-    : 0;
+     return op;
+  return 0;
 }
 /*
  * Returns the first object which has a name equal to the argument.
  * Used only by the patch command, but not all that useful.
   if (op->more)
     update_object (op->more, action);
 }
-object *object::first;
 object::object ()
 {
   SET_FLAG (this, FLAG_REMOVED);
   expmul = 1.0;
 object::~object ()
 {
   free_key_values (this);
 }
+static int object_count;
 void object::link ()
 {
-  assert (!count);//D
+  assert (!index);//D
   uuid = gen_uuid ();
+  count = ++object_count;
   refcnt_inc ();
   objects.insert (this);
 }
 void object::unlink ()
 {
-  assert (count);//D
+  assert (index);//D
   objects.erase (this);
   refcnt_dec ();
 }
 void
 }
 void
 object::do_destroy ()
 {
+  attachable::do_destroy ();
   if (flag [FLAG_IS_LINKED])
     remove_button_link (this);
   if (flag [FLAG_FRIENDLY])
     remove_friendly_object (this);
   if (!flag [FLAG_REMOVED])
     remove ();
-  if (flag [FLAG_FREED])
+  destroy_inv (true);
-    return;
-  set_speed (0);
+  deactivate ();
+  unlink ();
   flag [FLAG_FREED] = 1;
-  attachable::do_destroy ();
-  destroy_inv (true);
-  unlink ();
   // hack to ensure that freed objects still have a valid map
   {
     static maptile *freed_map; // freed objects are moved here to avoid crashes
 {
   static char info[256 * 4];
   return debug_desc (info);
 }
+const char *
+object::debug_desc2 () const
+{
+  static char info[256 * 4];
+  return debug_desc (info);
+}

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.111 by root, Mon Jan 8 01:19:02 2007 UTC vs. Revision 1.114 by root, Sun Jan 14 22:06:05 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.111 by root, Mon Jan 8 01:19:02 2007 UTC vs.
Revision 1.114 by root, Sun Jan 14 22:06:05 2007 UTC