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

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.48 by root, Thu Oct 15 23:25:53 2009 UTC vs.
Revision 1.52 by root, Fri Nov 6 13:31:47 2009 UTC

 /* these are needed for creation of a linked list of
  * pointers to all (hostile) monster objects */
 static int nrofmon = 0, need_to_write_bookarchive = 0;
-/* this is needed to keep track of status of initialisation
- * of the message file */
-static int nrofmsg = 0;
 /* first_msg is the started of the linked list of messages as read from
  * the messages file
  */
 static linked_char *first_msg = NULL;
 /*
  * Spellpath information
  */
 static uint32 spellpathdef[NRSPELLPATHS] = {
   PATH_PROT,
   PATH_FIRE,
   PATH_FROST,
   PATH_ELEC,
   /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"},
   {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
   {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
   {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
 };
-int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
+static int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
 static int max_titles[6] = {
   ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)),
   (sizeof (mon_book_name) / sizeof (char *)) * (sizeof (mon_author) / sizeof (char *)),
   (sizeof (art_book_name) / sizeof (char *)) * (sizeof (art_author) / sizeof (char *)),
       else
         strcat (rbuf, ".");
       tbuf = strtok (NULL, sbuf);
     }
   return (char *) rbuf;
-}
-static int
-book_overflow (const char *buf1, const char *buf2, int booksize)
-{
-  if (buf_overflow (buf1, buf2, BOOK_BUF - 2)   /* 2 less so always room for trailing \n */
-      || buf_overflow (buf1, buf2, booksize))
-    return 1;
-  return 0;
 }
 /*****************************************************************************
  *
  * Start of initialisation related functions.
 }
 /* init_mon_info() - creates the linked list of pointers to
  * monster archetype objects if not called previously
  */
 static void
-init_mon_info (void)
+init_mon_info ()
 {
   archetype *at;
   static int did_init_mon_info = 0;
   if (did_init_mon_info)
     return;
   did_init_mon_info = 1;
   for_all_archetypes (at)
-    {
+    if (at->flag [FLAG_MONSTER]
-      if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE)))
+        && at->is_head ()
+        && (!at->flag [FLAG_CHANGING] || at->flag [FLAG_UNAGGRESSIVE]))
-        {
+      {
-          objectlink *mon = new objectlink;
+        objectlink *mon = new objectlink;
-          mon->ob = at;
+        mon->ob = at;
-          mon->next = first_mon_info;
+        mon->next = first_mon_info;
-          first_mon_info = mon;
+        first_mon_info = mon;
-          nrofmon++;
+        nrofmon++;
-        }
+      }
-    }
   LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
 }
 /* init_readable() - initialise linked lists utilized by
       break;
   /* didn't find a match */
   if (!mon)
     return NULL;
   if (mon->next)
     return mon->next->ob;
   else
     return first_mon_info->ob;
 /* 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;
-  linked_char *lmsg, *nextmsg;
-  objectlink *monlink, *nextmon;
-  LOG (llevDebug, "freeing all book information\n");
-  for (tlist = booklist; tlist; tlist = tnext)
-    {
-      tnext = tlist->next;
-      for (title1 = tlist->first_book; title1; title1 = titlenext)
-        {
-          titlenext = title1->next;
-          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;
-      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.48 by root, Thu Oct 15 23:25:53 2009 UTC vs. Revision 1.52 by root, Fri Nov 6 13:31:47 2009 UTC

Diff Legend

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.48 by root, Thu Oct 15 23:25:53 2009 UTC vs.
Revision 1.52 by root, Fri Nov 6 13:31:47 2009 UTC