--- deliantra/server/common/treasure.C	2006/09/14 21:16:11	1.18
+++ deliantra/server/common/treasure.C	2006/12/10 20:15:57	1.22
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcs_treasure_c =
- *   "$Id: treasure.C,v 1.18 2006/09/14 21:16:11 root Exp $";
- */
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -24,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 #define ALLOWED_COMBINATION
@@ -466,10 +460,10 @@
   tmp = ob->inv;
   if (tmp != NULL)
     remove_ob (tmp);
+
   if (ob->inv)
-    {
-      LOG (llevError, "In generate treasure, created multiple objects.\n");
-    }
+    LOG (llevError, "In generate treasure, created multiple objects.\n");
+
   free_object (ob);
   return tmp;
 }
@@ -857,6 +851,12 @@
   if (difficulty < 1)
     difficulty = 1;
 
+  if (INVOKE_OBJECT (ADD_BONUS, op,
+                     ARG_OBJECT (creator != op ? creator : 0),
+                     ARG_INT (difficulty), ARG_INT (max_magic),
+                     ARG_INT (flags)))
+    return;
+
   if (!(flags & GT_MINIMAL))
     {
       if (op->arch == crown_arch)
@@ -1564,12 +1564,8 @@
   op->item_power = change->item_power;
 
   for (i = 0; i < NROFATTACKS; i++)
-    {
-      if (change->resist[i])
-        {
-          op->resist[i] += change->resist[i];
-        }
-    }
+    if (change->resist[i])
+      op->resist[i] += change->resist[i];
 
   if (change->stats.dam)
     {
@@ -1857,7 +1853,7 @@
   if (at->allowed)
     free_charlinks (at->allowed);
 
-  at->item->free (1);
+  at->item->destroy (1);
 
   delete at;
 }
@@ -1867,7 +1863,7 @@
 {
   artifactlist *nextal;
 
-  for (al = first_artifactlist; al != NULL; al = nextal)
+  for (al = first_artifactlist; al; al = nextal)
     {
       nextal = al->next;