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

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.49 by root, Fri Oct 16 00:02:22 2009 UTC vs.
Revision 1.50 by root, Sat Oct 24 00:43:30 2009 UTC

 /* mon_info_msg() - generate a message detailing the properties
  * of a randomly selected monster.
  */
 static const char *
-mon_info_msg (int level, int booksize)
+mon_info_msg (int level)
 {
   static dynbuf_text buf; buf.clear ();
   /*preamble */
   buf << "This beastiary contains:\n";
 /* artifact_msg() - generate a message detailing the properties
  * of 1-6 artifacts drawn sequentially from the artifact list.
  */
 static const char *
-artifact_msg (int level, int booksize)
+artifact_msg (int level)
 {
   artifactlist *al = NULL;
   artifact *art;
   int chance, i, type, index;
   int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
 /* spellpath_msg() - generate a message detailing the member
  * incantations/prayers (and some of their properties) belonging to
  * a given spellpath.
  */
 static char *
-spellpath_msg (int level, int booksize)
+spellpath_msg (int level)
 {
   static dynbuf_text buf; buf.clear ();
   static char retbuf[BOOK_BUF];
   char tmpbuf[BOOK_BUF];
       }
   /* Geez, no spells were generated. */
   if (!seen)
     if (rndm (4))        /* usually, lets make a recursive call... */
-      return spellpath_msg (level, booksize);
+      return spellpath_msg (level);
     else                      /* give up, cause knowing no spells exist for path is info too. */
       buf << "- no known spells exist.\n";
   return buf;
 }
 /* god_info_msg() - generate a message detailing the properties
  * of a random god. Used by the book hack. b.t.
  */
 static const char *
-god_info_msg (int level, int booksize)
+god_info_msg (int level)
 {
   const char *name = NULL;
   object *god = pntr_to_god_obj (get_rand_god ());
   static dynbuf_text buf; buf.clear ();
  *
  */
 void
 tailor_readable_ob (object *book, int msg_type)
 {
-  char msgbuf[BOOK_BUF];
   int level = book->level ? rndm (book->level) + 1 : 1;
-  int book_buf_size;
   /* safety */
   if (book->type != BOOK)
     return;
   if (level <= 0)
     return;                     /* if no level no point in doing any more... */
-  /* Max text length this book can have. */
-  book_buf_size = BOOKSIZE (book);
   /* &&& The message switch &&& */
   /* Below all of the possible types of messages in the "book"s.
    */
   /*
    * 2) make sure there is an entry in max_titles[] array.
    * 3) make sure there are entries for your case in new_text_title()
    *    and add_authour().
    * 4) you may want separate authour/book name arrays in read.h
    */
+  const char *new_msg = "";
   msg_type = msg_type > 0 ? msg_type : rndm (8);
   switch (msg_type)
     {
       case 1:                /* monster attrib */
-        strcpy (msgbuf, mon_info_msg (level, book_buf_size));
+        new_msg = mon_info_msg (level);
         break;
       case 2:                /* artifact attrib */
-        strcpy (msgbuf, artifact_msg (level, book_buf_size));
+        new_msg = artifact_msg (level);
         break;
       case 3:                /* grouping incantations/prayers by path */
-        strcpy (msgbuf, spellpath_msg (level, book_buf_size));
+        new_msg = spellpath_msg (level);
         break;
       case 4:                /* describe an alchemy formula */
         make_formula_book (book, level);
         /* make_formula_book already gives title */
         return;
       case 5:                /* bits of information about a god */
-        strcpy (msgbuf, god_info_msg (level, book_buf_size));
+        new_msg = god_info_msg (level);
         break;
       case 0:                /* use info list in lib/ */
       default:
         cfperl_make_book (book, level);
         /* already gives title */
         return;
     }
-  if (strlen (msgbuf) > 1)
+  if (strlen (new_msg) > 1)
     {
-      book->msg = msgbuf;
+      book->msg = new_msg;
       /* lets give the "book" a new name, which may be a compound word */
       change_book (book, msg_type);
     }
 }
 /*****************************************************************************
  *
  * Cleanup routine for readble stuff.
  *
  *****************************************************************************/
 void
 free_all_readable (void)
 {
   titlelist *tlist, *tnext;
   title *title1, *titlenext;
       nextmon = monlink->next;
       delete monlink;
     }
 }
 /*****************************************************************************
  *
  * Writeback routine for updating the bookarchive.
  *
  ****************************************************************************/
 /* write_book_archive() - write out the updated book archive */
 void
 write_book_archive (void)
 {
   FILE *fp;
   int index = 0;
   titlelist *bl = get_titlelist (0);
   /* If nothing changed, don't write anything */
   if (!need_to_write_bookarchive)
     return;
   need_to_write_bookarchive = 0;
   sprintf (fname, "%s/bookarch", settings.localdir);
   LOG (llevDebug, "Updating book archive: %s...\n", fname);
   if ((fp = fopen (fname, "w")) == NULL)
-    {
-      LOG (llevDebug, "Can't open book archive file %s\n", fname);
+    LOG (llevDebug, "Can't open book archive file %s\n", fname);
-    }
   else
     {
       while (bl)
         {
           for (book = bl->first_book; book; book = book->next)
                 fprintf (fp, "type %d\n", index);
                 fprintf (fp, "size %d\n", book->size);
                 fprintf (fp, "index %d\n", book->msg_index);
                 fprintf (fp, "end\n");
               }
           bl = bl->next;
           index++;
         }
       fclose (fp);
       chmod (fname, SAVE_MODE);
     }
 }
 readable_message_type *
 get_readable_message_type (object *readable)
 {
   uint8 subtype = readable->subtype;

Diff Legend

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

Comparing deliantra/server/common/readable.C (file contents): Revision 1.49 by root, Fri Oct 16 00:02:22 2009 UTC vs. Revision 1.50 by root, Sat Oct 24 00:43:30 2009 UTC

Diff Legend

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.49 by root, Fri Oct 16 00:02:22 2009 UTC vs.
Revision 1.50 by root, Sat Oct 24 00:43:30 2009 UTC