--- deliantra/server/common/treasure.C	2006/09/12 18:15:34	1.17
+++ deliantra/server/common/treasure.C	2006/12/26 08:54:59	1.28
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcs_treasure_c =
- *   "$Id: treasure.C,v 1.17 2006/09/12 18:15:34 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
@@ -60,13 +54,13 @@
 
   warn_archetypes = 1;
   if (ring_arch == NULL)
-    ring_arch = find_archetype ("ring");
+    ring_arch = archetype::find ("ring");
   if (amulet_arch == NULL)
-    amulet_arch = find_archetype ("amulet");
+    amulet_arch = archetype::find ("amulet");
   if (staff_arch == NULL)
-    staff_arch = find_archetype ("staff");
+    staff_arch = archetype::find ("staff");
   if (crown_arch == NULL)
-    crown_arch = find_archetype ("crown");
+    crown_arch = archetype::find ("crown");
   warn_archetypes = prev_warn;
 }
 
@@ -121,7 +115,7 @@
 
       if (sscanf (cp, "arch %s", variable))
         {
-          if ((t->item = find_archetype (variable)) == NULL)
+          if ((t->item = archetype::find (variable)) == NULL)
             LOG (llevError, "Treasure lacks archetype: %s\n", variable);
         }
       else if (sscanf (cp, "list %s", variable))
@@ -266,7 +260,7 @@
   if (!name_)
     return 0;
 
-  for (treasurelist * tl = first_treasurelist; tl != 0; tl = tl->next)
+  for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
     if (name_ == tl->name)
       return tl;
 
@@ -288,8 +282,6 @@
  * abilities.  This is used by summon spells, thus no summoned monsters
  * start with equipment, but only their abilities).
  */
-
-
 static void
 put_treasure (object *op, object *creator, int flags)
 {
@@ -310,9 +302,11 @@
   else
     {
       op = insert_ob_in_ob (op, creator);
+
       if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
         monster_check_apply (creator, op);
-      if ((flags & GT_UPDATE_INV) && (tmp = is_player_inv (creator)) != NULL)
+
+      if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
         esrv_send_item (tmp, op);
     }
 }
@@ -347,7 +341,11 @@
       if (t->name)
         {
           if (strcmp (t->name, "NONE") && difficulty >= t->magic)
-            create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries);
+            {
+              treasurelist *tl = find_treasurelist (t->name);
+              if (tl)
+                create_treasure (tl, op, flag, difficulty, tries);
+            }
         }
       else
         {
@@ -405,7 +403,11 @@
         return;
 
       if (difficulty >= t->magic)
-        create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries);
+        {
+          treasurelist *tl = find_treasurelist (t->name);
+          if (tl)
+            create_treasure (tl, op, flag, difficulty, tries);
+        }
       else if (t->nrof)
         create_one_treasure (tl, op, flag, difficulty, tries);
 
@@ -456,21 +458,23 @@
  * inserted into, and then return that treausre
  */
 object *
-generate_treasure (treasurelist * t, int difficulty)
+generate_treasure (treasurelist *t, int difficulty)
 {
-  object *ob = get_object (), *tmp;
+  difficulty = clamp (difficulty, 1, settings.max_level);
+
+  object *ob = object::create (), *tmp;
 
   create_treasure (t, ob, 0, difficulty, 0);
 
   /* Don't want to free the object we are about to return */
   tmp = ob->inv;
   if (tmp != NULL)
-    remove_ob (tmp);
+    tmp->remove ();
+
   if (ob->inv)
-    {
-      LOG (llevError, "In generate treasure, created multiple objects.\n");
-    }
-  free_object (ob);
+    LOG (llevError, "In generate treasure, created multiple objects.\n");
+
+  ob->destroy ();
   return tmp;
 }
 
@@ -857,6 +861,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)
@@ -1001,9 +1011,8 @@
           case RING:
             if (op->arch == NULL)
               {
-                remove_ob (op);
-                free_object (op);
-                op = NULL;
+                op->destroy ();
+                op = 0;
                 break;
               }
 
@@ -1265,7 +1274,8 @@
             fprintf (logfile, "  ");
           fprintf (logfile, "{   (list: %s)\n", &t->name);
           tl = find_treasurelist (t->name);
-          dump_monster_treasure_rec (name, tl->items, depth + 2);
+          if (tl)
+            dump_monster_treasure_rec (name, tl->items, depth + 2);
           for (i = 0; i < depth; i++)
             fprintf (logfile, "  ");
           fprintf (logfile, "}   (end of list: %s)\n", &t->name);
@@ -1392,7 +1402,7 @@
         art->difficulty = (uint8) value;
       else if (!strncmp (cp, "Object", 6))
         {
-          art->item = get_object ();
+          art->item = object::create ();
 
           if (!load_object (thawer, art->item, 0))
             LOG (llevError, "Init_Artifacts: Could not load object.\n");
@@ -1491,7 +1501,7 @@
       if (!QUERY_FLAG (op, FLAG_ALIVE))
         op->speed = 0.0;
 
-      update_ob_speed (op);
+      op->set_speed (op->speed);
     }
 
   if (change->nrof)
@@ -1513,11 +1523,7 @@
 
           /* Remove any spells this object currently has in it */
           while (op->inv)
-            {
-              tmp_obj = op->inv;
-              remove_ob (tmp_obj);
-              free_object (tmp_obj);
-            }
+            op->inv->destroy ();
 
           tmp_obj = arch_to_object (change->other_arch);
           insert_ob_in_ob (tmp_obj, op);
@@ -1564,12 +1570,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 +1859,7 @@
   if (at->allowed)
     free_charlinks (at->allowed);
 
-  at->item->free (1);
+  at->item->destroy (1);
 
   delete at;
 }
@@ -1867,7 +1869,7 @@
 {
   artifactlist *nextal;
 
-  for (al = first_artifactlist; al != NULL; al = nextal)
+  for (al = first_artifactlist; al; al = nextal)
     {
       nextal = al->next;