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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.120 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.123 by root, Fri Jan 26 20:59:56 2007 UTC

   face = blank_face;
 }
 object::~object ()
 {
-  if (index)
-    unlink ();
+  unlink ();
   free_key_values (this);
 }
 static int object_count;
   objects.insert (this);
 }
 void object::unlink ()
 {
-  assert (index);//D
+  if (!index)
+    return;
   objects.erase (this);
   refcnt_dec ();
 }
 void
    * drop on that space.
    */
   if (!drop_to_ground
       || !map
       || map->in_memory != MAP_IN_MEMORY
+      || map->nodrop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
         {
           inv->destroy_inv (drop_to_ground);
  *   This function removes the object op from the linked list of objects
  *   which it is currently tied to.  When this function is done, the
  *   object will have no environment.  If the object previously had an
  *   environment, the x and y coordinates will be updated to
  *   the previous environment.
- *   Beware: This function is called from the editor as well!
  */
 void
 object::remove_slow ()
 {
   object *tmp, *last = 0;

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