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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.111 by root, Mon Jan 8 01:19:02 2007 UTC

   free_key_values (this);
 }
 void object::link ()
 {
+  assert (!count);//D
   uuid = gen_uuid ();
+  refcnt_inc ();
   objects.insert (this);
 }
 void object::unlink ()
 {
+  assert (count);//D
   objects.erase (this);
+  refcnt_dec ();
 }
 void
 object::activate ()
 {
           if (op->flag [FLAG_STARTEQUIP]
               || op->flag [FLAG_NO_DROP]
               || op->type == RUNE
               || op->type == TRAP
-              || op->flag [FLAG_IS_A_TEMPLATE])
+              || op->flag [FLAG_IS_A_TEMPLATE]
+              || op->flag [FLAG_DESTROY_ON_DEATH])
             op->destroy ();
           else
             map->insert (op, x, y);
         }
     }

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