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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.258 by root, Mon Sep 29 09:04:50 2008 UTC vs.
Revision 1.264 by root, Sun Dec 21 23:29:27 2008 UTC

       || map->in_memory != MAP_ACTIVE
       || map->no_drop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
-        inv->destroy (true);
+        inv->destroy ();
     }
   else
     {                       /* Put objects in inventory onto this space */
       while (inv)
         {
               || op->flag [FLAG_NO_DROP]
               || op->type == RUNE
               || op->type == TRAP
               || op->flag [FLAG_IS_A_TEMPLATE]
               || op->flag [FLAG_DESTROY_ON_DEATH])
-            op->destroy (true);
+            op->destroy ();
           else
             map->insert (op, x, y);
         }
     }
 }
   x = 1;
   y = 1;
   if (more)
     {
-      more->destroy (true);
+      more->destroy ();
       more = 0;
     }
   head = 0;
   attacked_by    = 0;
   current_weapon = 0;
 }
 void
-object::destroy (bool destroy_inventory)
+object::destroy ()
 {
   if (destroyed ())
     return;
   if (!is_head () && !head->destroyed ())
     {
       LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
-      head->destroy (destroy_inventory);
+      head->destroy ();
       return;
     }
-  destroy_inv (!destroy_inventory);
+  destroy_inv (false);
   if (is_head ())
     if (sound_destroy)
       play_sound (sound_destroy);
     else if (flag [FLAG_MONSTER])
             }
           last = tmp;
         }
-      if (flag [FLAG_BLOCKSVIEW] || glow_radius)
+      if (map->darkness && (glow_radius || flag [FLAG_BLOCKSVIEW]))
         update_all_los (map, x, y);
     }
 }
 /*
           esrv_update_item (UPD_NROF, pl, top);
         op->weight   = 0; // cancel the addition above
         op->carrying = 0; // must be 0 already
-        op->destroy (true);
+        op->destroy ();
         return top;
       }
   return 0;
  *   just 'op' otherwise
  */
 object *
 insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
 {
-  if (op->is_on_map ())
-    {
-      LOG (llevError, "insert_ob_in_map called for object already on map");
-      abort ();
-    }
-  if (op->env)
-    {
-      LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
-      op->remove ();
+  op->remove ();
-    }
   if (m == &freed_map)//D TODO: remove soon
     {//D
       LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
     }//D
    * of areas of callers (eg, anything that uses find_free_spot would now
    * need extra work
    */
   if (!xy_normalise (m, op->x, op->y))
     {
-      op->head_ ()->destroy (true);// remove head_ once all tail object destroyers found
+      op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
       return 0;
     }
   if (object *more = op->more)
     if (!insert_ob_in_map (more, m, originator, flag))
         {
           // TODO: we actually want to update tmp, not op,
           // but some caller surely breaks when we return tmp
           // from here :/
           op->nrof += tmp->nrof;
-          tmp->destroy (true);
+          tmp->destroy ();
         }
   CLEAR_FLAG (op, FLAG_APPLIED);        /* hack for fixing F_APPLIED in items of dead people */
   CLEAR_FLAG (op, FLAG_INV_LOCKED);
    * be far away from this change and not affected in any way -
    * this should get redone to only look for players within range,
    * or just updating the P_UPTODATE for spaces within this area
    * of effect may be sufficient.
    */
-  if (op->map->darkness && (op->glow_radius != 0))
+  if (op->map->darkness && (op->glow_radius || op->flag [FLAG_BLOCKSVIEW]))
     update_all_los (op->map, op->x, op->y);
   /* updates flags (blocked, alive, no magic, etc) for this map space */
   update_object (op, UP_OBJ_INSERT);
 {
   /* first search for itself and remove any old instances */
   for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
     if (!strcmp (tmp->arch->archname, arch_string))       /* same archetype */
-      tmp->destroy (true);
+      tmp->destroy ();
   object *tmp = arch_to_object (archetype::find (arch_string));
   tmp->x = op->x;
   tmp->y = op->y;
           if (object *pl = tmp->visible_to ())
             esrv_update_item (UPD_NROF, pl, tmp);
           adjust_weight (this, op->total_weight ());
-          op->destroy (true);
+          op->destroy ();
           op = tmp;
           goto inserted;
         }
   op->owner = 0; // it's his/hers now. period.
        * head of the object should correspond for the entire object.
        */
       if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
         continue;
-      if (ob->blocked (m, pos.x, pos.y))
+      if (ob->blocked (pos.m, pos.x, pos.y))
         continue;
       altern [index++] = i;
     }
 #if 0
       // remove the "Close old_container" object.
       if (object *closer = old_container->inv)
         if (closer->type == CLOSE_CON)
-          closer->destroy (true);
+          closer->destroy ();
 #endif
       // make sure the container is available
       esrv_send_item (this, old_container);
 void
 object::force_add (const shstr name, int duration)
 {
   if (object *force = force_find (name))
-    force->destroy (true);
+    force->destroy ();
   object *force = get_archetype (FORCE_NAME);
   force->slaying    = name;
   force->stats.food = 1;

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.258 by root, Mon Sep 29 09:04:50 2008 UTC vs. Revision 1.264 by root, Sun Dec 21 23:29:27 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.258 by root, Mon Sep 29 09:04:50 2008 UTC vs.
Revision 1.264 by root, Sun Dec 21 23:29:27 2008 UTC