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

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.7 by root, Wed Sep 13 23:39:27 2006 UTC vs.
Revision 1.15 by pippijn, Wed Jan 3 00:08:17 2007 UTC

     You should have received a copy of the GNU General Public License
     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>
 */
 /* This file contains code relevant to the BOOKS hack -- designed
  * to allow randomly occuring messages in non-magical texts.
   if (did_init_msgfile)
     return;
   did_init_msgfile = 1;
   sprintf (fname, "%s/messages", settings.datadir);
-  LOG (llevDebug, "Reading messages from %s...", fname);
+  LOG (llevDebug, "Reading messages from %s...\n", fname);
   if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
     {
       linked_char *tmp = NULL;
           if (!strncmp (cp, "ENDMSG", 6))
             {
               if (strlen (msgbuf) > BOOK_BUF)
                 {
                   LOG (llevDebug, "Warning: this string exceeded max book buf size:");
-                  LOG (llevDebug, "  %s", msgbuf);
+                  LOG (llevDebug, "  %s\n", msgbuf);
                 }
               tmp->name = msgbuf;
               tmp->next = first_msg;
               first_msg = tmp;
               nrofmsg++;
         }
       close_and_delete (fp, comp);
     }
 #ifdef BOOK_MSG_DEBUG
-  LOG (llevDebug, "\ninit_info_listfile() got %d messages.\n", nrofmsg);
+  LOG (llevDebug, "init_info_listfile() got %d messages.\n", nrofmsg);
 #endif
   LOG (llevDebug, "done.\n");
 }
               book->next = bl->first_book;
               bl->first_book = book;
               bl->number++;
             }
         }
-      LOG (llevDebug, " book archives(used/avail): ");
+      LOG (llevDebug, "book archives(used/avail): \n");
       for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++)
         {
-          LOG (llevDebug, "(%d/%d)", bl->number, max_titles[i]);
+          LOG (llevDebug, " (%d/%d)\n", bl->number, max_titles[i]);
         }
-      LOG (llevDebug, "\n");
       close_and_delete (fp, comp);
     }
 #ifdef BOOK_MSG_DEBUG
-  LOG (llevDebug, "\n init_book_archive() got %d titles.\n", nroftitle);
+  LOG (llevDebug, "init_book_archive() got %d titles.\n", nroftitle);
 #endif
   LOG (llevDebug, " done.\n");
 }
 /* init_mon_info() - creates the linked list of pointers to
   archetype *at;
   static int did_init_mon_info = 0;
   if (did_init_mon_info)
     return;
   did_init_mon_info = 1;
   for (at = first_archetype; at != NULL; at = at->next)
     {
       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);
 }
 /* init_readable() - initialize linked lists utilized by
 {
   static int did_this;
   if (did_this)
     return;
   did_this = 1;
-  LOG (llevDebug, "Initializing reading data...");
+  LOG (llevDebug, "Initialising reading data...\n");
   init_msgfile ();
   init_book_archive ();
   init_mon_info ();
   LOG (llevDebug, " Done\n");
                 /* alter book properties */
                 if ((tmpbook = get_archetype (t->archname)) != NULL)
                   {
                     tmpbook->msg = book->msg;
-                    copy_object (tmpbook, book);
+                    tmpbook->copy_to (book);
-                    free_object (tmpbook);
+                    tmpbook->destroy ();
                   }
                 book->title = t->authour;
                 book->name = t->name;
                 book->level = t->level;
        * level is kinda high */
       if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF))
         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);
       else
         break;
       archetype *at;
       /* 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);
       /* item name */
       if (formula->ingred != NULL)
         {
           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");
           for (next = formula->ingred; next != NULL; next = next->next)
           strcpy (msgbuf, msgfile_msg (level, book_buf_size));
           break;
     }
   strcat (msgbuf, "\n");        /* safety -- we get ugly map saves/crashes w/o this */
   if (strlen (msgbuf) > 1)
     {
       book->msg = msgbuf;
       /* lets give the "book" a new name, which may be a compound word */
       change_book (book, msg_type);
           delete title1;
         }
       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;
     }
 }
 /*****************************************************************************

Diff Legend

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

Comparing deliantra/server/common/readable.C (file contents): Revision 1.7 by root, Wed Sep 13 23:39:27 2006 UTC vs. Revision 1.15 by pippijn, Wed Jan 3 00:08:17 2007 UTC

Diff Legend

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.7 by root, Wed Sep 13 23:39:27 2006 UTC vs.
Revision 1.15 by pippijn, Wed Jan 3 00:08:17 2007 UTC