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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.78 by root, Sun Jul 20 16:56:34 2008 UTC vs.
Revision 1.80 by root, Mon Sep 29 09:04:51 2008 UTC

 typedef std::tr1::unordered_map<
    const char *,
    treasurelist *,
    str_hash,
    str_equal,
-   slice_allocator< std::pair<const char *const, treasurelist *> >,
+   slice_allocator< std::pair<const char *const, treasurelist *> >
-   true
 > tl_map_t;
 static tl_map_t tl_map;
 /*
        * by another object.
        */
       //TODO: flag such as objects... as such (no drop, anybody?)
       if (op->type == SPELL)
         {
-          op->destroy ();
+          op->destroy (true);
           return;
         }
       op->expand_tail ();
       if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
-        op->destroy ();
+        op->destroy (true);
       else
         {
           SET_FLAG (op, FLAG_OBJ_ORIGINAL);
           op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
         }
     tmp->remove ();
   if (ob->inv)
     LOG (llevError, "In generate treasure, created multiple objects.\n");
-  ob->destroy ();
+  ob->destroy (true);
   return tmp;
 }
 /*
  * This is a new way of calculating the chance for an item to have
           case AMULET:
             if (IS_ARCH (op->arch, amulet))
               op->value *= 5;   /* Since it's not just decoration */
           case RING:
-            if (!op->arch) // wtf? schmorp
-              {
-                op->destroy ();
-                op = 0;
-                break;
-              }
             if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet))       /* It's a special artifact! */
               break;
             if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
               SET_FLAG (op, FLAG_CURSED);
        * to cast.  So convert that to into a spell and put it into
        * this object.
        */
       if (op->type == HORN || op->type == POTION)
         {
-          object *tmp_obj;
           /* Remove any spells this object currently has in it */
-          while (op->inv)
-            op->inv->destroy ();
+          op->destroy_inv ();
-          tmp_obj = arch_to_object (change->other_arch);
+          object *tmp = arch_to_object (change->other_arch);
-          insert_ob_in_ob (tmp_obj, op);
+          insert_ob_in_ob (tmp, op);
         }
       /* No harm setting this for potions/horns */
       op->other_arch = change->other_arch;
     }
 free_artifact (artifact *at)
 {
   if (at->next)    free_artifact  (at->next);
   if (at->allowed) free_charlinks (at->allowed);
-  at->item->destroy (1);
+  at->item->destroy (true);
   sfree (at);
 }
 void

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.78 by root, Sun Jul 20 16:56:34 2008 UTC vs. Revision 1.80 by root, Mon Sep 29 09:04:51 2008 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.78 by root, Sun Jul 20 16:56:34 2008 UTC vs.
Revision 1.80 by root, Mon Sep 29 09:04:51 2008 UTC