--- deliantra/server/common/treasure.C	2008/07/20 16:56:34	1.78
+++ deliantra/server/common/treasure.C	2009/10/15 16:00:37	1.87
@@ -5,18 +5,19 @@
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -47,8 +48,7 @@
    treasurelist *,
    str_hash,
    str_equal,
-   slice_allocator< std::pair<const char *const, treasurelist *> >,
-   true
+   slice_allocator< std::pair<const char *const, treasurelist *> >
 > tl_map_t;
 
 static tl_map_t tl_map;
@@ -444,6 +444,7 @@
     LOG (llevError, "In generate treasure, created multiple objects.\n");
 
   ob->destroy ();
+
   return tmp;
 }
 
@@ -968,13 +969,6 @@
               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;
 
@@ -1005,8 +999,8 @@
                   }
               }
 
-            if (GET_ANIM_ID (op))
-              SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
+            if (op->animation_id)
+              op->set_anim_frame (rndm (op->anim_frames ()));
 
             break;
 
@@ -1031,19 +1025,20 @@
                 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
                 /* books w/ info are worth more! */
                 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
-                /* creator related stuff */
-
-                /* for library, chained books.  Note that some monsters have no_pick
-                 * set - we don't want to set no pick in that case.
-                 */
-                if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
-                  SET_FLAG (op, FLAG_NO_PICK);
-                if (creator->slaying && !op->slaying)   /* for check_inv floors */
-                  op->slaying = creator->slaying;
 
                 /* add exp so reading it gives xp (once) */
                 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
               }
+
+            /* creator related stuff */
+
+            /* for library, chained books.  Note that some monsters have no_pick
+              * set - we don't want to set no pick in that case.
+              */
+            if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
+              SET_FLAG (op, FLAG_NO_PICK);
+            if (creator->slaying && !op->slaying)   /* for check_inv floors */
+              op->slaying = creator->slaying;
             break;
 
           case SPELLBOOK:
@@ -1356,14 +1351,11 @@
        */
       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 (false);
 
-          tmp_obj = arch_to_object (change->other_arch);
-          insert_ob_in_ob (tmp_obj, op);
+          object *tmp = arch_to_object (change->other_arch);
+          insert_ob_in_ob (tmp, op);
         }
       /* No harm setting this for potions/horns */
       op->other_arch = change->other_arch;
@@ -1578,9 +1570,11 @@
 #endif
           return;
         }
-      if (!strcmp (art->item->name, "NONE"))
+
+      if (art->item->name == shstr_NONE)
         return;
-      if (FABS (op->magic) < art->item->magic)
+
+      if (fabs (op->magic) < art->item->magic)
         continue;               /* Not magic enough to be this item */
 
       /* Map difficulty not high enough */
@@ -1641,8 +1635,10 @@
       /* if donor has some attacktypes, the flesh is poisonous */
       if (donor->attacktype & AT_POISON)
         item->type = POISON;
+
       if (donor->attacktype & AT_ACID)
         item->stats.hp = -1 * item->stats.food;
+
       SET_FLAG (item, FLAG_NO_STEAL);
     }
 }
@@ -1689,7 +1685,7 @@
   if (at->next)    free_artifact  (at->next);
   if (at->allowed) free_charlinks (at->allowed);
 
-  at->item->destroy (1);
+  at->item->destroy ();
 
   sfree (at);
 }