--- deliantra/server/common/readable.C	2006/09/13 23:32:04	1.6
+++ deliantra/server/common/readable.C	2006/12/12 21:39:56	1.13
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcsid_readable_c =
- *   "$Id: readable.C,v 1.6 2006/09/13 23:32:04 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>
 */
 
 
@@ -823,6 +817,7 @@
 
   if (did_init_mon_info)
     return;
+
   did_init_mon_info = 1;
 
 
@@ -830,15 +825,15 @@
     {
       if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE)))
         {
-          objectlink *mon = (objectlink *) malloc (sizeof (objectlink));
+          objectlink *mon = new objectlink;
 
           mon->ob = &at->clone;
-          mon->id = nrofmon;
           mon->next = first_mon_info;
           first_mon_info = mon;
           nrofmon++;
         }
     }
+
   LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
 }
 
@@ -857,6 +852,7 @@
 
   if (did_this)
     return;
+
   did_this = 1;
 
   LOG (llevDebug, "Initializing reading data...");
@@ -1105,8 +1101,8 @@
                 if ((tmpbook = get_archetype (t->archname)) != NULL)
                   {
                     tmpbook->msg = book->msg;
-                    copy_object (tmpbook, book);
-                    free_object (tmpbook);
+                    tmpbook->copy_to (book);
+                    tmpbook->destroy ();
                   }
 
                 book->title = t->authour;
@@ -1473,13 +1469,13 @@
         strcat (buf, art->item->msg);
 
       /* properties of the artifact */
-      tmp = get_object ();
+      tmp = object::create ();
       add_abilities (tmp, art->item);
       tmp->type = type;
       SET_FLAG (tmp, FLAG_IDENTIFIED);
       if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1)
         sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch);
-      free_object (tmp);
+      tmp->destroy ();
       /* add the buf if it will fit */
       if (!book_overflow (retbuf, buf, booksize))
         strcat (retbuf, buf);
@@ -1619,7 +1615,7 @@
       /* preamble */
       sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
 
-      if ((at = find_archetype (op_name)) != (archetype *) NULL)
+      if ((at = archetype::find (op_name)) != (archetype *) NULL)
         op_name = at->clone.name;
       else
         LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
@@ -1658,7 +1654,7 @@
           linked_char *next;
           archetype *at;
 
-          at = find_archetype (formula->cauldron);
+          at = archetype::find (formula->cauldron);
 
           sprintf (retbuf + strlen (retbuf),
                    " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place");
@@ -1986,6 +1982,7 @@
     }
 
   strcat (msgbuf, "\n");        /* safety -- we get ugly map saves/crashes w/o this */
+
   if (strlen (msgbuf) > 1)
     {
       book->msg = msgbuf;
@@ -2024,15 +2021,17 @@
 
       delete tlist;
     }
+
   for (lmsg = first_msg; lmsg; lmsg = nextmsg)
     {
       nextmsg = lmsg->next;
       delete lmsg;
     }
+
   for (monlink = first_mon_info; monlink; monlink = nextmon)
     {
       nextmon = monlink->next;
-      free (monlink);
+      delete monlink;
     }
 }