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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.261 by root, Wed Oct 1 16:04:16 2008 UTC

       || ob1->speed != ob2->speed
       || ob1->value != ob2->value
       || ob1->name  != ob2->name)
     return 0;
-  /* Do not merge objects if nrof would overflow. First part checks
+  /* Do not merge objects if nrof would overflow, assume nrof
-   * for unsigned overflow (2c), second part checks whether the result
+   * is always 0 .. 2**31-1 */
-   * would fit into a 32 bit signed int, which is often used to hold
+  if (ob1->nrof > 0x7fffffff - ob2->nrof)
-   * nrof values.
-   */
-  if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
     return 0;
   /* If the objects have been identified, set the BEEN_APPLIED flag.
    * This is to the comparison of the flags below will be OK. We
    * just can't ignore the been applied or identified flags, as they
       || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
     return 0;
   if ((ob1->flag ^ ob2->flag)
       .reset (FLAG_INV_LOCKED)
-      .reset (FLAG_CLIENT_SENT)
       .reset (FLAG_REMOVED)
       .any ())
     return 0;
   /* This is really a spellbook check - we should in general
     }
   if (speed < 0)
     dst->speed_left -= rndm ();
-  dst->set_speed (dst->speed);
+  dst->activate ();
 }
 void
 object::instantiate ()
 {
 {
   /* If already on active list, don't do anything */
   if (active)
     return;
+  if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
+  if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
   if (has_active_speed ())
     actives.insert (this);
 }
 void
       || 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);
         }
     }
 }
   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])
           esrv_update_item (UPD_NROF, pl, top);
         op->weight   = 0; // cancel the addition above
         op->carrying = 0; // must be 0 already
-        op->destroy (1);
+        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 (op->face && !face_info (op->face))//D TODO: remove soon
+  if (m == &freed_map)//D TODO: remove soon
     {//D
-      LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
+      LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
-      op->face = 1;//D
     }//D
   /* Ideally, the caller figures this out.  However, it complicates a lot
    * 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 (1);// 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 (1);
+          tmp->destroy ();
         }
   CLEAR_FLAG (op, FLAG_APPLIED);        /* hack for fixing F_APPLIED in items of dead people */
   CLEAR_FLAG (op, FLAG_INV_LOCKED);
 {
   /* 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 (1);
+      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 (1);
+          op->destroy ();
           op = tmp;
           goto inserted;
         }
   op->owner = 0; // it's his/hers now. period.

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC vs. Revision 1.261 by root, Wed Oct 1 16:04:16 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.261 by root, Wed Oct 1 16:04:16 2008 UTC