ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/readable.C
(Generate patch)

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.29 by root, Sat Jun 30 02:24:32 2007 UTC vs.
Revision 1.58 by root, Thu Apr 15 21:49:15 2010 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* This file contains code relevant to the BOOKS hack -- designed 25/* This file contains code relevant to the BOOKS hack -- designed
26 * to allow randomly occuring messages in non-magical texts. 26 * to allow randomly occuring messages in non-magical texts.
27 */ 27 */
… …
30 30
31#include <global.h> 31#include <global.h>
32#include <book.h> 32#include <book.h>
33#include <living.h> 33#include <living.h>
34#include <spells.h> 34#include <spells.h>
35
36 35
37/* Define this if you want to archive book titles by contents. 36/* Define this if you want to archive book titles by contents.
38 * This option should enforce UNIQUE combinations of titles,authors and 37 * This option should enforce UNIQUE combinations of titles,authors and
39 * msg contents during and *between* game sessions. 38 * msg contents during and *between* game sessions.
40 * Note: a slight degeneracy exists since books are archived based on an integer 39 * Note: a slight degeneracy exists since books are archived based on an integer
… …
109/* these are needed for creation of a linked list of 108/* these are needed for creation of a linked list of
110 * pointers to all (hostile) monster objects */ 109 * pointers to all (hostile) monster objects */
111 110
112static int nrofmon = 0, need_to_write_bookarchive = 0; 111static int nrofmon = 0, need_to_write_bookarchive = 0;
113 112
114
115/* this is needed to keep track of status of initialisation
116 * of the message file */
117static int nrofmsg = 0;
118
119/* first_msg is the started of the linked list of messages as read from
120 * the messages file
121 */
122static linked_char *first_msg = NULL;
123
124/* 113/*
125 * Spellpath information 114 * Spellpath information
126 */ 115 */
127
128static uint32 spellpathdef[NRSPELLPATHS] = { 116static uint32 spellpathdef[NRSPELLPATHS] = {
129 PATH_PROT, 117 PATH_PROT,
130 PATH_FIRE, 118 PATH_FIRE,
131 PATH_FROST, 119 PATH_FROST,
132 PATH_ELEC, 120 PATH_ELEC,
… …
498 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"}, 486 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"},
499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"}, 487 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"}, 488 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"} 489 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
502}; 490};
503int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 491static int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
504 492
505static int max_titles[6] = { 493static int max_titles[6] = {
506 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)), 494 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)),
507 (sizeof (mon_book_name) / sizeof (char *)) * (sizeof (mon_author) / sizeof (char *)), 495 (sizeof (mon_book_name) / sizeof (char *)) * (sizeof (mon_author) / sizeof (char *)),
508 (sizeof (art_book_name) / sizeof (char *)) * (sizeof (art_author) / sizeof (char *)), 496 (sizeof (art_book_name) / sizeof (char *)) * (sizeof (art_author) / sizeof (char *)),
… …
516 * Start of misc. readable functions used by others functions in this file 504 * Start of misc. readable functions used by others functions in this file
517 * 505 *
518 *****************************************************************************/ 506 *****************************************************************************/
519 507
520static titlelist * 508static titlelist *
521get_empty_booklist (void) 509get_empty_booklist ()
522{ 510{
523 titlelist *bl = new titlelist; 511 titlelist *bl = new titlelist;
524 512
525 bl->number = 0; 513 bl->number = 0;
526 bl->first_book = NULL; 514 bl->first_book = NULL;
527 bl->next = NULL; 515 bl->next = NULL;
528 return bl; 516 return bl;
529} 517}
530 518
531static title * 519static title *
532get_empty_book (void) 520get_empty_book ()
533{ 521{
534 title *t = new title; 522 title *t = new title;
535 523
536 t->name = NULL; 524 t->name = NULL;
537 t->archname = NULL; 525 t->archname = NULL;
… …
546/* get_titlelist() - returns pointer to the title list referanced by i */ 534/* get_titlelist() - returns pointer to the title list referanced by i */
547 535
548static titlelist * 536static titlelist *
549get_titlelist (int i) 537get_titlelist (int i)
550{ 538{
539 if (!booklist)
540 booklist = get_empty_booklist ();
541
551 titlelist *tl = booklist; 542 titlelist *tl = booklist;
552 int number = i; 543 int number = i;
553 544
554 if (number < 0) 545 if (number < 0)
555 return tl; 546 return tl;
… …
558 { 549 {
559 if (!tl->next) 550 if (!tl->next)
560 tl->next = get_empty_booklist (); 551 tl->next = get_empty_booklist ();
561 552
562 tl = tl->next; 553 tl = tl->next;
563 number--; 554 --number;
564 } 555 }
565 556
566 return tl; 557 return tl;
567} 558}
568 559
… …
570 * (shstr.c ?), but the quantity BOOK_BUF will need to be defined. */ 561 * (shstr.c ?), but the quantity BOOK_BUF will need to be defined. */
571 562
572/* nstrtok() - simple routine to return the number of list 563/* nstrtok() - simple routine to return the number of list
573 * items in buf1 as separated by the value of buf2 564 * items in buf1 as separated by the value of buf2
574 */ 565 */
575 566static int
576int
577nstrtok (const char *buf1, const char *buf2) 567nstrtok (const char *buf1, const char *buf2)
578{ 568{
579 char *tbuf, sbuf[12], buf[MAX_BUF]; 569 char *tbuf, sbuf[12], buf[MAX_BUF];
580 int number = 0; 570 int number = 0;
581 571
… …
594 584
595/* strtoktolin() - takes a string in buf1 and separates it into 585/* strtoktolin() - takes a string in buf1 and separates it into
596 * a list of strings delimited by buf2. Then returns a comma 586 * a list of strings delimited by buf2. Then returns a comma
597 * separated string w/ decent punctuation. 587 * separated string w/ decent punctuation.
598 */ 588 */
599 589static char *
600char *
601strtoktolin (const char *buf1, const char *buf2) 590strtoktolin (const char *buf1, const char *buf2)
602{ 591{
603 int maxi, i = nstrtok (buf1, buf2); 592 int maxi, i = nstrtok (buf1, buf2);
604 char *tbuf, buf[MAX_BUF], sbuf[12]; 593 char *tbuf, buf[MAX_BUF], sbuf[12];
605 static char rbuf[BOOK_BUF]; 594 static char rbuf[BOOK_BUF];
… …
622 tbuf = strtok (NULL, sbuf); 611 tbuf = strtok (NULL, sbuf);
623 } 612 }
624 return (char *) rbuf; 613 return (char *) rbuf;
625} 614}
626 615
627int
628book_overflow (const char *buf1, const char *buf2, int booksize)
629{
630
631 if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */
632 || buf_overflow (buf1, buf2, booksize))
633 return 1;
634 return 0;
635
636
637}
638
639/***************************************************************************** 616/*****************************************************************************
640 * 617 *
641 * Start of initialisation related functions. 618 * Start of initialisation related functions.
642 * 619 *
643 ****************************************************************************/ 620 ****************************************************************************/
… …
645/* init_book_archive() - if not called before, initialise the info list 622/* init_book_archive() - if not called before, initialise the info list
646 * This reads in the bookarch file into memory. bookarch is the file 623 * This reads in the bookarch file into memory. bookarch is the file
647 * created and updated across multiple runs of the program. 624 * created and updated across multiple runs of the program.
648 */ 625 */
649static void 626static void
650init_book_archive (void) 627init_book_archive ()
651{ 628{
652 FILE *fp;
653 int comp, nroftitle = 0; 629 int nroftitle = 0;
654 char buf[MAX_BUF], fname[MAX_BUF], *cp; 630 char fname[MAX_BUF];
655 title *book = NULL;
656 titlelist *bl = get_empty_booklist (); 631 titlelist *bl = get_empty_booklist ();
657 static int did_init_barch;
658
659 if (did_init_barch)
660 return;
661
662 did_init_barch = 1;
663
664 if (!booklist)
665 booklist = bl;
666 632
667 sprintf (fname, "%s/bookarch", settings.localdir); 633 sprintf (fname, "%s/bookarch", settings.localdir);
668 LOG (llevDebug, " Reading bookarch from %s...\n", fname); 634 LOG (llevDebug, " Reading bookarch from %s...\n", fname);
669 635
670 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL) 636 object_thawer thawer (fname);
637
638 if (!thawer)
639 {
640 LOG (llevDebug, "could not read bookarch file\n");
641 return;
671 { 642 }
643
644 while (thawer.kw)
645 {
646 if (thawer.kw != KW_title)
647 if (!thawer.parse_error ("bookarch file"))
648 break;
649
650 title *book = get_empty_book (); /* init new book entry */
651 thawer.get (book->name);
652
672 int value, type = 0; 653 int type = -1;
673 size_t i;
674 654
675 while (fgets (buf, MAX_BUF, fp) != NULL) 655 for (;;)
676 { 656 {
677 if (*buf == '#') 657 thawer.next ();
678 continue; 658
679 if ((cp = strchr (buf, '\n')) != NULL) 659 switch (thawer.kw)
680 *cp = '\0';
681 cp = buf;
682 while (*cp == ' ') /* Skip blanks */
683 cp++;
684 if (!strncmp (cp, "title", 4))
685 { 660 {
686 book = get_empty_book (); /* init new book entry */ 661 case KW_type: thawer.get (type ); break;
687 book->name = strchr (cp, ' ') + 1; 662 case KW_authour: thawer.get (book->authour ); break;
688 type = -1; 663 case KW_arch: thawer.get (book->archname ); break;
689 nroftitle++; 664 case KW_level: thawer.get (book->level ); break;
690 continue; 665 case KW_size: thawer.get (book->size ); break;
691 } 666 case KW_index: thawer.get (book->msg_index); break;
692 if (!strncmp (cp, "authour", 4)) 667
693 { 668 case KW_end:
694 book->authour = strchr (cp, ' ') + 1;
695 }
696 if (!strncmp (cp, "arch", 4))
697 {
698 book->archname = strchr (cp, ' ') + 1;
699 }
700 else if (sscanf (cp, "level %d", &value))
701 {
702 book->level = (uint16) value;
703 }
704 else if (sscanf (cp, "type %d", &value))
705 {
706 type = (uint16) value;
707 }
708 else if (sscanf (cp, "size %d", &value))
709 {
710 book->size = (uint16) value;
711 }
712 else if (sscanf (cp, "index %d", &value))
713 {
714 book->msg_index = (uint16) value;
715 }
716 else if (!strncmp (cp, "end", 3))
717 { /* link it */ 669 /* link it */
718 bl = get_titlelist (type); 670 bl = get_titlelist (type);
719 book->next = bl->first_book; 671 book->next = bl->first_book;
720 bl->first_book = book; 672 bl->first_book = book;
721 bl->number++; 673 bl->number++;
674 ++nroftitle;
675 goto book_done;
676
677 default:
678 delete book;
679 goto book_done;
722 } 680 }
723 } 681 }
682
683book_done:
684 thawer.next ();
685 }
686
724 LOG (llevDebug, "book archives(used/avail): \n"); 687 LOG (llevDebug, "book archives(used/avail): \n");
688 int i;
725 for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++) 689 for (bl = booklist, i = 0; bl && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++)
726 {
727 LOG (llevDebug, " (%d/%d)\n", bl->number, max_titles[i]); 690 LOG (llevDebug, " (%d/%d)\n", bl->number, max_titles[i]);
728 }
729 close_and_delete (fp, comp);
730 }
731 691
732#ifdef BOOK_MSG_DEBUG
733 LOG (llevDebug, "init_book_archive() got %d titles.\n", nroftitle); 692 LOG (llevDebug, "init_book_archive() got %d titles.\n", nroftitle);
734#endif
735 LOG (llevDebug, " done.\n"); 693 LOG (llevDebug, " done.\n");
736} 694}
737 695
738/* init_mon_info() - creates the linked list of pointers to 696/* init_mon_info() - creates the linked list of pointers to
739 * monster archetype objects if not called previously 697 * monster archetype objects if not called previously
740 */ 698 */
741
742static void 699static void
743init_mon_info (void) 700init_mon_info ()
744{ 701{
745 archetype *at; 702 archetype *at;
746 static int did_init_mon_info = 0; 703 static int did_init_mon_info = 0;
747 704
748 if (did_init_mon_info) 705 if (did_init_mon_info)
749 return; 706 return;
750 707
751 did_init_mon_info = 1; 708 did_init_mon_info = 1;
752 709
753 for_all_archetypes (at) 710 for_all_archetypes (at)
754 { 711 if (at->flag [FLAG_MONSTER]
755 if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE))) 712 && at->is_head ()
713 && (!at->flag [FLAG_CHANGING] || at->flag [FLAG_UNAGGRESSIVE]))
756 { 714 {
757 objectlink *mon = new objectlink; 715 objectlink *mon = new objectlink;
758 716
759 mon->ob = at; 717 mon->ob = at;
760 mon->next = first_mon_info; 718 mon->next = first_mon_info;
761 first_mon_info = mon; 719 first_mon_info = mon;
762 nrofmon++; 720 nrofmon++;
763 } 721 }
764 }
765 722
766 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 723 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
767} 724}
768 725
769/* init_readable() - initialise linked lists utilized by 726/* init_readable() - initialise linked lists utilized by
… …
771 * 728 *
772 * This is the function called by the main routine to initialise 729 * This is the function called by the main routine to initialise
773 * all the readable information. 730 * all the readable information.
774 */ 731 */
775void 732void
776init_readable (void) 733init_readable ()
777{ 734{
778 static int did_this; 735 static int did_this;
779 736
780 if (did_this) 737 if (did_this)
781 return; 738 return;
… …
818 else 775 else
819 t = t->next; 776 t = t->next;
820 777
821#ifdef ARCHIVE_DEBUG 778#ifdef ARCHIVE_DEBUG
822 if (t) 779 if (t)
823 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, t->name, t->authour, t->msg_index); 780 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, &t->name, &t->authour, t->msg_index);
824#endif 781#endif
825 782
826 return t; 783 return t;
827} 784}
828 785
… …
830 * handled directly in change_book_name(). Names are based on text 787 * handled directly in change_book_name(). Names are based on text
831 * msgtype 788 * msgtype
832 * this sets book book->name based on msgtype given. What name 789 * this sets book book->name based on msgtype given. What name
833 * is given is based on various criteria 790 * is given is based on various criteria
834 */ 791 */
835
836static void 792static void
837new_text_name (object *book, int msgtype) 793new_text_name (object *book, int msgtype)
838{ 794{
839 int nbr; 795 int nbr;
840 char name[MAX_BUF]; 796 char name[MAX_BUF];
… …
933 */ 889 */
934 890
935static int 891static int
936unique_book (const object *book, int msgtype) 892unique_book (const object *book, int msgtype)
937{ 893{
938 title *test;
939
940 if (!booklist) 894 if (!booklist)
941 return 1; /* No archival entries! Must be unique! */ 895 return 1; /* No archival entries! Must be unique! */
942 896
943 /* Go through the booklist. If the author and name match, not unique so 897 /* Go through the booklist. If the author and name match, not unique so
944 * return 0. 898 * return 0.
945 */ 899 */
946 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 900 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
947 {
948 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 901 if (test->name == book->name && book->title == test->authour)
949 return 0; 902 return 0;
950 } 903
951 return 1; 904 return 1;
952} 905}
953 906
954/* add_book_to_list() */ 907/* add_book_to_list() */
955 908
… …
979 932
980 /* We have stuff we need to write now */ 933 /* We have stuff we need to write now */
981 need_to_write_bookarchive = 1; 934 need_to_write_bookarchive = 1;
982 935
983#ifdef ARCHIVE_DEBUG 936#ifdef ARCHIVE_DEBUG
984 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", book->name, book->title, msgtype); 937 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", &book->name, &book->title, msgtype);
985#endif 938#endif
986 939
987} 940}
988 941
989 942
… …
995 * levels and architypes. -b.t. 948 * levels and architypes. -b.t.
996 */ 949 */
997 950
998#define MAX_TITLE_CHECK 20 951#define MAX_TITLE_CHECK 20
999 952
1000void 953static void
1001change_book (object *book, int msgtype) 954change_book (object *book, int msgtype)
1002{ 955{
1003 int nbr = sizeof (book_descrpt) / sizeof (char *); 956 int nbr = sizeof (book_descrpt) / sizeof (char *);
1004 957
1005 switch (book->type) 958 switch (book->type)
1006 { 959 {
1007 case BOOK: 960 case BOOK:
1008 { 961 {
1009 titlelist *tl = get_titlelist (msgtype); 962 titlelist *tl = get_titlelist (msgtype);
1010 title *t = NULL; 963 title *t = NULL;
1011 int tries = 0; 964 int tries = 0;
1012 965
1013 /* look to see if our msg already been archived. If so, alter 966 /* look to see if our msg already been archived. If so, alter
1014 * the book to match the archival text. If we fail to match, 967 * the book to match the archival text. If we fail to match,
1015 * then we archive the new title/name/msg combo if there is 968 * then we archive the new title/name/msg combo if there is
1016 * room on the titlelist. 969 * room on the titlelist.
1017 */ 970 */
1018 971
1019 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 972 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1020 { 973 {
1021 object *tmpbook;
1022
1023 /* alter book properties */ 974 /* alter book properties */
1024 if ((tmpbook = get_archetype (t->archname)) != NULL) 975 if (object *tmpbook = get_archetype (t->archname))
976 {
977 tmpbook->msg = book->msg;
978 tmpbook->copy_to (book);
979 tmpbook->destroy ();
980 }
981
982 book->title = t->authour;
983 book->name = t->name;
984 book->level = t->level;
985 }
986 /* Don't have any default title, so lets make up a new one */
987 else
988 {
989 int numb, maxnames = max_titles[msgtype];
990 const char *old_title;
991 const char *old_name;
992
993 old_title = book->title;
994 old_name = book->name;
995
996 /* some pre-generated books have title already set (from
997 * maps), also don't bother looking for unique title if
998 * we already used up all the available names! */
999
1000 if (!tl)
1001 {
1002 LOG (llevError, "change_book_name(): can't find title list\n");
1003 numb = 0;
1004 }
1005 else
1006 numb = tl->number;
1007
1008 if (numb == maxnames)
1009 {
1010#ifdef ARCHIVE_DEBUG
1011 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1012#endif
1013 }
1014 /* shouldnt change map-maker books */
1015 else if (!book->title)
1016 do
1025 { 1017 {
1026 tmpbook->msg = book->msg; 1018 /* random book name */
1027 tmpbook->copy_to (book); 1019 new_text_name (book, msgtype);
1028 tmpbook->destroy (); 1020 add_author (book, msgtype); /* random author */
1021 tries++;
1029 } 1022 }
1023 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1030 1024
1031 book->title = t->authour; 1025 /* Now deal with 2 cases.
1032 book->name = t->name; 1026 * 1)If no space for a new title exists lets just restore
1033 book->level = t->level; 1027 * the old book properties. Remember, if the book had
1028 * matchd an older entry on the titlelist, we shouldnt
1029 * have called this routine in the first place!
1030 * 2) If we got a unique title, we need to add it to
1031 * the list.
1034 } 1032 */
1035 /* Don't have any default title, so lets make up a new one */
1036 else
1037 {
1038 int numb, maxnames = max_titles[msgtype];
1039 const char *old_title;
1040 const char *old_name;
1041 1033
1042 old_title = book->title; 1034 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1043 old_name = book->name; 1035 { /* got to check maxnames again */
1044
1045 /* some pre-generated books have title already set (from
1046 * maps), also don't bother looking for unique title if
1047 * we already used up all the available names! */
1048
1049 if (!tl)
1050 {
1051 LOG (llevError, "change_book_name(): can't find title list\n");
1052 numb = 0;
1053 }
1054 else
1055 numb = tl->number;
1056
1057 if (numb == maxnames)
1058 {
1059#ifdef ARCHIVE_DEBUG 1036#ifdef ARCHIVE_DEBUG
1060 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1037 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
1061#endif 1038#endif
1062 break; 1039 /* restore old book properties here */
1063 } 1040 book->title = old_title;
1064 /* shouldnt change map-maker books */ 1041
1065 else if (!book->title) 1042 if (rndm (4))
1066 do
1067 { 1043 {
1068 /* random book name */ 1044 /* Lets give the book a description to individualize it some */
1069 new_text_name (book, msgtype); 1045 char new_name[MAX_BUF];
1070 add_author (book, msgtype); /* random author */ 1046
1071 tries++; 1047 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1048
1049 book->name = new_name;
1072 } 1050 }
1073 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1074
1075 /* Now deal with 2 cases.
1076 * 1)If no space for a new title exists lets just restore
1077 * the old book properties. Remember, if the book had
1078 * matchd an older entry on the titlelist, we shouldnt
1079 * have called this routine in the first place!
1080 * 2) If we got a unique title, we need to add it to
1081 * the list.
1082 */
1083
1084 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1085 { /* got to check maxnames again */
1086#ifdef ARCHIVE_DEBUG
1087 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1088#endif
1089 /* restore old book properties here */
1090 book->title = old_title;
1091
1092 if (RANDOM () % 4)
1093 {
1094 /* Lets give the book a description to individualize it some */
1095 char new_name[MAX_BUF];
1096
1097 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1098
1099 book->name = new_name;
1100 }
1101 else 1051 else
1102 { 1052 {
1103 book->name = old_name; 1053 book->name = old_name;
1104 } 1054 }
1105 } 1055 }
1106 else if (book->title && strlen (book->msg) > 5) 1056 else if (book->title && strlen (book->msg) > 5)
1107 { /* archive if long msg texts */ 1057 { /* archive if long msg texts */
1108 add_book_to_list (book, msgtype); 1058 add_book_to_list (book, msgtype);
1109 } 1059 }
1110 } 1060 }
1111 break; 1061 break;
1112 } 1062 }
1113 1063
1114 default: 1064 default:
1115 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1065 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1116 return; 1066 return;
1117 } 1067 }
1118} 1068}
1119 1069
1120/***************************************************************************** 1070/*****************************************************************************
1121 * 1071 *
… …
1132 * list of all monsters in the current game. If level is non-zero, 1082 * list of all monsters in the current game. If level is non-zero,
1133 * then only monsters greater than that level will be returned. 1083 * then only monsters greater than that level will be returned.
1134 * Changed 971225 to be greater than equal to level passed. Also 1084 * Changed 971225 to be greater than equal to level passed. Also
1135 * made choosing by level more random. 1085 * made choosing by level more random.
1136 */ 1086 */
1137
1138object * 1087object *
1139get_random_mon (int level) 1088get_random_mon (int level)
1140{ 1089{
1141 objectlink *mon = first_mon_info; 1090 objectlink *mon = first_mon_info;
1142 int i = 0, monnr; 1091 int i = 0, monnr;
… …
1146 return (object *) NULL; 1095 return (object *) NULL;
1147 1096
1148 if (!level) 1097 if (!level)
1149 { 1098 {
1150 /* lets get a random monster from the mon_info linked list */ 1099 /* lets get a random monster from the mon_info linked list */
1151 monnr = RANDOM () % nrofmon; 1100 monnr = rndm (nrofmon);
1152 1101
1153 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1102 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1154 if (i++ == monnr) 1103 if (i++ == monnr)
1155 break; 1104 break;
1156 1105
… …
1183 { 1132 {
1184 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level); 1133 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
1185 return NULL; 1134 return NULL;
1186 } 1135 }
1187 1136
1188 monnr = RANDOM () % i; 1137 monnr = rndm (i);
1189 for (mon = first_mon_info; mon; mon = mon->next) 1138 for (mon = first_mon_info; mon; mon = mon->next)
1190 if (mon->ob->level >= level && monnr-- == 0) 1139 if (mon->ob->level >= level && monnr-- == 0)
1191 return mon->ob; 1140 return mon->ob;
1192 1141
1193 if (!mon) 1142 if (!mon)
… …
1200 1149
1201/* 1150/*
1202 * Returns a description of the monster. This really needs to be 1151 * Returns a description of the monster. This really needs to be
1203 * redone, as describe_item really gives a pretty internal description. 1152 * redone, as describe_item really gives a pretty internal description.
1204 */ 1153 */
1205 1154static const char *
1206char *
1207mon_desc (const object *mon) 1155mon_desc (const object *mon)
1208{ 1156{
1209 static char retbuf[HUGE_BUF]; 1157 static dynbuf_text buf; buf.clear ();
1210 1158
1211 sprintf (retbuf, " *** %s ***\n", &mon->name); 1159 buf.printf ("B<< %s >>\r", &mon->name);
1212 strcat (retbuf, describe_item (mon, NULL)); 1160 buf << describe_item (mon, 0);
1213 1161
1214 return retbuf; 1162 return buf;
1215} 1163}
1216 1164
1217 1165
1218/* This function returns the next monsters after 'tmp'. If no match is 1166/* This function returns the next monsters after 'tmp'. If no match is
1219 * found, it returns NULL (changed 0.94.3 to do this, since the 1167 * found, it returns NULL (changed 0.94.3 to do this, since the
1220 * calling function (mon_info_msg) seems to expect that. 1168 * calling function (mon_info_msg) seems to expect that.
1221 */ 1169 */
1222 1170static object *
1223object *
1224get_next_mon (object *tmp) 1171get_next_mon (object *tmp)
1225{ 1172{
1226 objectlink *mon; 1173 objectlink *mon;
1227 1174
1228 for (mon = first_mon_info; mon; mon = mon->next) 1175 for (mon = first_mon_info; mon; mon = mon->next)
… …
1230 break; 1177 break;
1231 1178
1232 /* didn't find a match */ 1179 /* didn't find a match */
1233 if (!mon) 1180 if (!mon)
1234 return NULL; 1181 return NULL;
1182
1235 if (mon->next) 1183 if (mon->next)
1236 return mon->next->ob; 1184 return mon->next->ob;
1237 else 1185 else
1238 return first_mon_info->ob; 1186 return first_mon_info->ob;
1239 1187
1240} 1188}
1241 1189
1242
1243
1244/* mon_info_msg() - generate a message detailing the properties 1190/* mon_info_msg() - generate a message detailing the properties
1245 * of a randomly selected monster. 1191 * of a randomly selected monster.
1246 */ 1192 */
1247 1193static const char *
1248char *
1249mon_info_msg (int level, int booksize) 1194mon_info_msg (int level)
1250{ 1195{
1251 static char retbuf[BOOK_BUF]; 1196 static dynbuf_text buf; buf.clear ();
1252 char tmpbuf[HUGE_BUF];
1253 object *tmp;
1254 1197
1255 /*preamble */ 1198 /*preamble */
1256 strcpy (retbuf, "This beastiary contains:"); 1199 buf << "This beastiary contains:\n";
1257 1200
1258 /* lets print info on as many monsters as will fit in our 1201 /* lets print info on as many monsters as will fit in our
1259 * document. 1202 * document.
1260 * 8-96 Had to change this a bit, otherwise there would 1203 * 8-96 Had to change this a bit, otherwise there would
1261 * have been an impossibly large number of combinations 1204 * have been an impossibly large number of combinations
1262 * of text! (and flood out the available number of titles 1205 * of text! (and flood out the available number of titles
1263 * in the archive in a snap!) -b.t. 1206 * in the archive in a snap!) -b.t.
1264 */ 1207 */
1265 tmp = get_random_mon (level * 3); 1208 object *tmp = get_random_mon (level * 3);
1266 while (tmp) 1209 while (tmp && buf.size () < BOOK_BUF)
1267 { 1210 {
1268 /* monster description */ 1211 /* monster description */
1269 sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp)); 1212 buf.printf ("\n%s\n", mon_desc (tmp));
1270
1271 if (!book_overflow (retbuf, tmpbuf, booksize))
1272 strcat (retbuf, tmpbuf);
1273 else
1274 break;
1275 1213
1276 /* Note that the value this returns is not based on level */ 1214 /* Note that the value this returns is not based on level */
1277 tmp = get_next_mon (tmp); 1215 tmp = get_next_mon (tmp);
1278 } 1216 }
1279 1217
1280#ifdef BOOK_MSG_DEBUG
1281 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf));
1282 fprintf (logfile, " MADE THIS:\n%s\n", retbuf);
1283#endif
1284
1285 return retbuf; 1218 return buf;
1286} 1219}
1287 1220
1288 1221
1289/***************************************************************************** 1222/*****************************************************************************
1290 * Artifact msg generation code. 1223 * Artifact msg generation code.
1291 ****************************************************************************/ 1224 ****************************************************************************/
1292 1225
1293/* artifact_msg() - generate a message detailing the properties 1226/* artifact_msg() - generate a message detailing the properties
1294 * of 1-6 artifacts drawn sequentially from the artifact list. 1227 * of 1-6 artifacts drawn sequentially from the artifact list.
1295 */ 1228 */
1296const char * 1229static const char *
1297artifact_msg (int level, int booksize) 1230artifact_msg (int level)
1298{ 1231{
1299 artifactlist *al = NULL; 1232 artifactlist *al = NULL;
1300 artifact *art; 1233 artifact *art;
1301 int chance, i, type, index; 1234 int chance, i, type, index;
1302 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1235 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1303 const char *ch; 1236 const char *ch;
1304 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1237 char name[MAX_BUF];
1305 static char retbuf[BOOK_BUF];
1306 object *tmp = NULL; 1238 object *tmp = NULL;
1239
1240 static dynbuf_text buf; buf.clear ();
1307 1241
1308 /* values greater than 5 create msg buffers that are too big! */ 1242 /* values greater than 5 create msg buffers that are too big! */
1309 if (book_entries > 5) 1243 if (book_entries > 5)
1310 book_entries = 5; 1244 book_entries = 5;
1311 1245
… …
1315 * for that type exists! 1249 * for that type exists!
1316 */ 1250 */
1317 i = 0; 1251 i = 0;
1318 do 1252 do
1319 { 1253 {
1320 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1254 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1321 type = art_name_array[index].type; 1255 type = art_name_array[index].type;
1322 al = find_artifactlist (type); 1256 al = find_artifactlist (type);
1323 i++; 1257 i++;
1324 } 1258 }
1325 while ((al == NULL) && (i < 10)); 1259 while ((al == NULL) && (i < 10));
… …
1328 return "None"; 1262 return "None";
1329 1263
1330 /* There is no reason to start on the artifact list at the begining. Lets 1264 /* There is no reason to start on the artifact list at the begining. Lets
1331 * take our starting position randomly... */ 1265 * take our starting position randomly... */
1332 art = al->items; 1266 art = al->items;
1333 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1267 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1334 { 1268 {
1335 if (art == NULL) 1269 if (!art)
1336 art = al->items; /* hmm, out of stuff, loop back around */ 1270 art = al->items; /* hmm, out of stuff, loop back around */
1271
1337 art = art->next; 1272 art = art->next;
1338 } 1273 }
1339 1274
1340 /* the base 'generic' name for our artifact */ 1275 /* the base 'generic' name for our artifact */
1341 assign (name, art_name_array[index].name); 1276 assign (name, art_name_array[index].name);
1342 1277
1343 /* Ok, lets print out the contents */ 1278 /* Ok, lets print out the contents */
1344 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1279 buf.printf ("Herein %s detailed %s...\n",
1280 book_entries > 1 ? "are" : "is",
1281 book_entries > 1 ? "some artifacts" : "an artifact");
1345 1282
1346 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1283 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
1347 * as long as we have space up to the allowed max # (book_entires) 1284 * as long as we have space up to the allowed max # (book_entires)
1348 */ 1285 */
1349 while (book_entries > 0) 1286 while (book_entries > 0 && buf.size () < BOOK_BUF)
1350 { 1287 {
1351 1288
1352 if (art == NULL) 1289 if (!art)
1353 art = al->items; 1290 art = al->items;
1354 1291
1355 /* separator of items */ 1292 buf << '\n';
1356 strcpy (buf, "--- \n");
1357 1293
1358 /* Name */ 1294 /* Name */
1359 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1295 if (art->allowed && art->allowed->name != shstr_All)
1360 { 1296 {
1361 linked_char *temp, *next = art->allowed; 1297 linked_char *temp, *next = art->allowed;
1362 1298
1363 do 1299 do
1364 { 1300 {
1365 temp = next; 1301 temp = next;
1366 next = next->next; 1302 next = next->next;
1367 } 1303 }
1368 while (next && !RANDOM () % 2); 1304 while (next && rndm (2));
1305
1369 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1306 buf.printf ("A B<< %s of %s >>", &temp->name, &art->item->name);
1370 } 1307 }
1371 else /* default name is used */ 1308 else /* default name is used */
1372 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1309 buf.printf ("The B<< %s of %s >>", name, &art->item->name);
1310
1311 buf << " is ";
1373 1312
1374 /* chance of finding */ 1313 /* chance of finding */
1375 chance = (int) (100 * ((float) art->chance / al->total_chance)); 1314 chance = (int) (100 * ((float) art->chance / al->total_chance));
1376 if (chance >= 20) 1315 if (chance >= 20)
1377 sprintf (sbuf, "an uncommon"); 1316 buf << "an uncommon";
1378 else if (chance >= 10) 1317 else if (chance >= 10)
1379 sprintf (sbuf, "an unusual"); 1318 buf << "an unusual";
1380 else if (chance >= 5) 1319 else if (chance >= 5)
1381 sprintf (sbuf, "a rare"); 1320 buf << "a rare";
1382 else 1321 else
1383 sprintf (sbuf, "a very rare"); 1322 buf << "a very rare";
1384 sprintf (buf, "%s is %s\n", buf, sbuf);
1385 1323
1386 /* value of artifact */ 1324 /* value of artifact */
1387 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1325 buf << " item with a value that is " << art->item->value << " times normal.\n";
1388 1326
1389 /* include the message about the artifact, if exists, and book 1327 /* include the message about the artifact, if exists, and book
1390 * level is kinda high */ 1328 * level is kinda high */
1391 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1329 if (art->item->msg
1330 && rndm (4) + 1 < level)
1392 strcat (buf, art->item->msg); 1331 buf << art->item->msg;
1393 1332
1394 /* properties of the artifact */ 1333 /* properties of the artifact */
1395 tmp = object::create (); 1334 tmp = object::create ();
1396 add_abilities (tmp, art->item); 1335 add_abilities (tmp, art->item);
1397 tmp->type = type; 1336 tmp->type = type;
1398 SET_FLAG (tmp, FLAG_IDENTIFIED); 1337 tmp->set_flag (FLAG_IDENTIFIED);
1399 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1338 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
1400 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1339 buf << "\rProperties of this artifact include:\r" << ch << "\n";
1340
1401 tmp->destroy (); 1341 tmp->destroy ();
1402 /* add the buf if it will fit */
1403 if (!book_overflow (retbuf, buf, booksize))
1404 strcat (retbuf, buf);
1405 else
1406 break;
1407 1342
1408 art = art->next; 1343 art = art->next;
1409 book_entries--; 1344 book_entries--;
1410 } 1345 }
1411 1346
1412#ifdef BOOK_MSG_DEBUG
1413 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf));
1414 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1415#endif
1416 return retbuf; 1347 return buf;
1417} 1348}
1418 1349
1419/***************************************************************************** 1350/*****************************************************************************
1420 * Spellpath message generation 1351 * Spellpath message generation
1421 *****************************************************************************/ 1352 *****************************************************************************/
1422 1353
1423/* spellpath_msg() - generate a message detailing the member 1354/* spellpath_msg() - generate a message detailing the member
1424 * incantations/prayers (and some of their properties) belonging to 1355 * incantations/prayers (and some of their properties) belonging to
1425 * a given spellpath. 1356 * a given spellpath.
1426 */ 1357 */
1427 1358static char *
1428char *
1429spellpath_msg (int level, int booksize) 1359spellpath_msg (int level)
1430{ 1360{
1361 static dynbuf_text buf; buf.clear ();
1362
1431 static char retbuf[BOOK_BUF]; 1363 static char retbuf[BOOK_BUF];
1432 char tmpbuf[BOOK_BUF]; 1364 char tmpbuf[BOOK_BUF];
1433 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1365 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1434 int did_first_sp = 0;
1435 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1366 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1436 archetype *at; 1367 archetype *at;
1437 1368
1438 /* Preamble */ 1369 /* Preamble */
1439 sprintf (retbuf, "Herein are detailed the names of %s\n", prayers ? "prayers" : "incantations"); 1370 buf << "Herein are detailed the names of "
1371 << (prayers ? "prayers" : "incantations");
1440 1372
1441 if (path == -1) 1373 if (path == -1)
1442 strcat (retbuf, "having no known spell path.\n"); 1374 buf << " having no known spell path.\n";
1443 else 1375 else
1444 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1376 buf << " belonging to the path of B<< " << spellpathnames[path] << " >>:\n\n";
1377
1378 int seen = 0;
1445 1379
1446 for_all_archetypes (at) 1380 for_all_archetypes (at)
1447 {
1448 /* Determine if this is an appropriate spell. Must 1381 /* Determine if this is an appropriate spell. Must
1449 * be of matching path, must be of appropriate type (prayer 1382 * be of matching path, must be of appropriate type (prayer
1450 * or not), and must be within the valid level range. 1383 * or not), and must be within the valid level range.
1451 */ 1384 */
1452 if (at->type == SPELL && at->path_attuned & pnum && 1385 if (at->type == SPELL && at->path_attuned & pnum &&
1453 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8))) 1386 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1454 { 1387 {
1455 assign (tmpbuf, at->object::name); 1388 seen = 1;
1456 1389 buf << at->object::name << '\r';
1457 if (book_overflow (retbuf, tmpbuf, booksize))
1458 break;
1459 else
1460 {
1461 if (did_first_sp)
1462 strcat (retbuf, ",\n");
1463 did_first_sp = 1;
1464 strcat (retbuf, tmpbuf);
1465 }
1466 } 1390 }
1467 } 1391
1468 /* Geez, no spells were generated. */ 1392 /* Geez, no spells were generated. */
1469 if (!did_first_sp) 1393 if (!seen)
1470 {
1471 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1394 if (rndm (4)) /* usually, lets make a recursive call... */
1472 spellpath_msg (level, booksize); 1395 return spellpath_msg (level);
1473 else /* give up, cause knowing no spells exist for path is info too. */ 1396 else /* give up, cause knowing no spells exist for path is info too. */
1474 strcat (retbuf, "\n - no known spells exist -\n"); 1397 buf << "- no known spells exist.\n";
1475 } 1398
1476 else
1477 {
1478 strcat (retbuf, "\n");
1479 }
1480 return retbuf; 1399 return buf;
1481} 1400}
1482 1401
1483/* formula_msg() - generate a message detailing the properties 1402/* formula_msg() - generate a message detailing the properties
1484 * of a randomly selected alchemical formula. 1403 * of a randomly selected alchemical formula.
1485 */ 1404 */
1486void 1405static void
1487make_formula_book (object *book, int level) 1406make_formula_book (object *book, int level)
1488{ 1407{
1489 char retbuf[BOOK_BUF], title[MAX_BUF]; 1408 char title[MAX_BUF];
1490 recipelist *fl; 1409 recipelist *fl;
1491 recipe *formula = NULL; 1410 recipe *formula = NULL;
1492 int chance; 1411 int chance;
1493 1412
1413 static dynbuf_text buf; buf.clear ();
1414
1494 /* the higher the book level, the more complex (ie number of 1415 /* the higher the book level, the more complex (ie number of
1495 * ingredients) the formula can be. 1416 * ingredients) the formula can be.
1496 */ 1417 */
1497 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1418 fl = get_formulalist (rndm (level) / 3 + 1);
1498 1419
1499 if (!fl) 1420 if (!fl)
1500 fl = get_formulalist (1); /* safety */ 1421 fl = get_formulalist (1); /* safety */
1501 1422
1502 if (fl->total_chance == 0) 1423 if (fl->total_chance == 0)
… …
1506 add_author (book, 4); 1427 add_author (book, 4);
1507 return; 1428 return;
1508 } 1429 }
1509 1430
1510 /* get a random formula, weighted by its bookchance */ 1431 /* get a random formula, weighted by its bookchance */
1511 chance = RANDOM () % fl->total_chance; 1432 chance = rndm (fl->total_chance);
1512 for (formula = fl->items; formula != NULL; formula = formula->next) 1433 for (formula = fl->items; formula; formula = formula->next)
1513 { 1434 {
1514 chance -= formula->chance; 1435 chance -= formula->chance;
1436
1515 if (chance <= 0) 1437 if (chance <= 0)
1516 break; 1438 break;
1517 } 1439 }
1518 1440
1519 if (!formula || formula->arch_names <= 0) 1441 if (!formula || formula->arch_names <= 0)
1520 { 1442 {
1521 book->msg = "<indecipherable text>\n"; 1443 book->msg = "<indecipherable text>\n";
1522 new_text_name (book, 4); 1444 new_text_name (book, 4);
1523 add_author (book, 4); 1445 add_author (book, 4);
1524 1446 return;
1525 } 1447 }
1448
1449 /* looks like a formula was found. Base the amount
1450 * of information on the booklevel and the spellevel
1451 * of the formula. */
1452
1453 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1454 archetype *at;
1455
1456 /* preamble */
1457 buf << "Herein is described a project using B<< "
1458 << (formula->skill ? &formula->skill : "an unknown skill")
1459 << " >>:\n\n";
1460
1461 if ((at = archetype::find (op_name)))
1462 op_name = at->object::name;
1526 else 1463 else
1464 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1465
1466 /* item name */
1467 if (formula->title != shstr_NONE)
1468 {
1469 buf.printf ("The B<< %s of %s >>", op_name, &formula->title);
1470 /* This results in things like pile of philo. sulfur.
1471 * while philo. sulfur may look better, without this,
1472 * you get things like 'the wise' because its missing the
1473 * water of section.
1474 */
1475 sprintf (title, "%s: %s of %s",
1476 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1527 { 1477 }
1528 /* looks like a formula was found. Base the amount 1478 else
1529 * of information on the booklevel and the spellevel 1479 {
1530 * of the formula. */ 1480 buf << "The B<< " << op_name;
1531 1481
1532 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1482 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1483 if (at->title)
1484 {
1485 buf << " " << at->title;
1486 strcat (title, " ");
1487 strcat (title, at->title);
1488 }
1489
1490 buf << " >>";
1491 }
1492
1493 /* Lets name the book something meaningful ! */
1494 book->name = title;
1495 book->title = NULL;
1496
1497 /* ingredients to make it */
1498 if (formula->ingred)
1499 {
1500 linked_char *next;
1533 archetype *at; 1501 archetype *at;
1534 1502
1535 /* preamble */
1536 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1537
1538 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1539 op_name = at->object::name;
1540 else
1541 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1542
1543 /* item name */
1544 if (strcmp (formula->title, "NONE"))
1545 {
1546 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1547 /* This results in things like pile of philo. sulfur.
1548 * while philo. sulfur may look better, without this,
1549 * you get things like 'the wise' because its missing the
1550 * water of section.
1551 */
1552 sprintf (title, "%s: %s of %s",
1553 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1554 }
1555 else
1556 {
1557 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1558 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name);
1559 if (at->title)
1560 {
1561 strcat (retbuf, " ");
1562 strcat (retbuf, at->title);
1563 strcat (title, " ");
1564 strcat (title, at->title);
1565 }
1566 }
1567 /* Lets name the book something meaningful ! */
1568 book->name = title;
1569 book->title = NULL;
1570
1571 /* ingredients to make it */
1572 if (formula->ingred != NULL)
1573 {
1574 linked_char *next;
1575 archetype *at;
1576
1577 at = archetype::find (formula->cauldron); 1503 at = archetype::find (formula->cauldron);
1578 1504
1579 sprintf (retbuf + strlen (retbuf), 1505 buf.printf (" may be made at %s using the following ingredients:\n\n",
1580 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place"); 1506 at ? query_name (at) : "an appropriate place");
1581 1507
1582 for (next = formula->ingred; next != NULL; next = next->next) 1508 for (next = formula->ingred; next; next = next->next)
1583 { 1509 buf << next->name << '\r';
1584 strcat (retbuf, next->name); 1510 }
1585 strcat (retbuf, "\n");
1586 }
1587 }
1588 else 1511 else
1589 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title); 1512 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title);
1590 if (retbuf[strlen (retbuf) - 1] != '\n') 1513
1514 book->msg = buf;
1515}
1516
1517#define DESCRIBE_PATH(retbuf, variable, name) \
1518 if(variable) { \
1519 int i,j=0; \
1520 strcat(retbuf,"(" name ": "); \
1521 for(i=0; i<NRSPELLPATHS; i++) \
1522 if(variable & (1<<i)) { \
1523 if (j) \
1524 strcat(retbuf,", "); \
1525 else \
1526 j = 1; \
1527 strcat(retbuf, spellpathnames[i]); \
1528 } \
1591 strcat (retbuf, "\n"); 1529 strcat(retbuf,")"); \
1592
1593 book->msg = retbuf;
1594 } 1530 }
1595}
1596 1531
1597/* god_info_msg() - generate a message detailing the properties 1532/* god_info_msg() - generate a message detailing the properties
1598 * of a random god. Used by the book hack. b.t. 1533 * of a random god. Used by the book hack. b.t.
1599 */ 1534 */
1600const char * 1535static const char *
1601god_info_msg (int level, int booksize) 1536god_info_msg (int level)
1602{ 1537{
1603 static char retbuf[BOOK_BUF];
1604 const char *name = NULL; 1538 const char *name = NULL;
1605 char buf[BOOK_BUF];
1606 int i;
1607 size_t introlen;
1608 object *god = pntr_to_god_obj (get_rand_god ()); 1539 object *god = pntr_to_god_obj (get_rand_god ());
1609 1540
1541 static dynbuf_text buf; buf.clear ();
1542
1610 if (!god) 1543 if (!god)
1611 return (char *) NULL; /* oops, problems... */ 1544 return 0; /* oops, problems... */
1545
1612 name = god->name; 1546 name = god->name;
1613 1547
1614 /* preamble.. */ 1548 /* preamble.. */
1615 sprintf (retbuf, "This document contains knowledge concerning\n"); 1549 buf << "This document contains knowledge concerning the diety B<< "
1616 sprintf (retbuf, "%sthe diety %s", retbuf, name); 1550 << name << " >>";
1617 1551
1618 /* Always have as default information the god's descriptive terms. */ 1552 /* Always have as default information the god's descriptive terms. */
1619 if (nstrtok (god->msg, ",") > 0) 1553 if (nstrtok (god->msg, ",") > 0)
1620 { 1554 buf << ", known as" << strtoktolin (god->msg, ",");
1621 strcat (retbuf, ", known as");
1622 strcat (retbuf, strtoktolin (god->msg, ","));
1623 }
1624 else 1555 else
1625 strcat (retbuf, "..."); 1556 buf << "...";
1626 1557
1627 strcat (retbuf, "\n ---\n"); 1558 buf << "\n\n";
1559
1628 introlen = strlen (retbuf); /* so we will know if no new info is added later */ 1560 int introlen = buf.size (); /* so we will know if no new info is added later */
1629 1561
1630 /* Information about the god is random, and based on the level of the 1562 /* Information about the god is random, and based on the level of the
1631 * 'book'. Probably there is a more intellegent way to implement 1563 * 'book'. Probably there is a more intellegent way to implement
1632 * this ... 1564 * this ...
1633 */ 1565 */
1634 1566 while (level > 0 && buf.size () < BOOK_BUF)
1635 while (level > 0)
1636 { 1567 {
1637 sprintf (buf, " ");
1638 if (level == 2 && RANDOM () % 2) 1568 if (level == 2 && rndm (2))
1639 { /* enemy god */ 1569 { /* enemy god */
1640 const char *enemy = god->title; 1570 const char *enemy = god->title;
1641 1571
1642 if (enemy) 1572 if (enemy)
1643 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1573 buf.printf ("The gods %s and %s are enemies.\r", name, enemy);
1644 } 1574 }
1645 1575
1646 if (level == 3 && RANDOM () % 2) 1576 if (level == 3 && rndm (2))
1647 { /* enemy race, what the god's holy word effects */ 1577 { /* enemy race, what the god's holy word effects */
1648 const char *enemy = god->slaying; 1578 const char *enemy = god->slaying;
1579 int i;
1649 1580
1650 if (enemy && !(god->path_denied & PATH_TURNING)) 1581 if (enemy && !(god->path_denied & PATH_TURNING))
1651 if ((i = nstrtok (enemy, ",")) > 0) 1582 if ((i = nstrtok (enemy, ",")) > 0)
1652 { 1583 {
1653 char tmpbuf[MAX_BUF]; 1584 char tmpbuf[MAX_BUF];
1654 1585
1655 sprintf (buf, "The holy words of %s have the power to\n", name); 1586 buf << "The holy words of " << name
1656 strcat (buf, "slay creatures belonging to the "); 1587 << " have the power to slay creatures belonging to the ";
1588
1657 if (i > 1) 1589 if (i > 1)
1658 sprintf (tmpbuf, "following \n races:%s", strtoktolin (enemy, ",")); 1590 buf << "following races:" << strtoktolin (enemy, ",");
1659 else 1591 else
1660 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1592 buf << "race of" << strtoktolin (enemy, ",");
1661 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1593
1594 buf << '\r';
1662 } 1595 }
1663 } 1596 }
1664 1597
1665 if (level == 4 && RANDOM () % 2) 1598 if (level == 4 && rndm (2))
1666 { /* Priest of god gets these protect,vulnerable... */ 1599 { /* Priest of god gets these protect,vulnerable... */
1667 char tmpbuf[MAX_BUF];
1668
1669 if (const char *cp = describe_resistance (god, 1)) 1600 if (const char *cp = describe_resistance (god, 1))
1670 { /* This god does have protections */ 1601 { /* This god does have protections */
1671 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1602 buf << name
1603 << " has a potent aura which is extended to"
1672 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1604 " faithful priests. The effects of this aura include: "
1673 strcat (tmpbuf, cp); 1605 << cp
1674 strcat (buf, tmpbuf); 1606 << ".\r";
1675 strcat (buf, "\n ---\n");
1676 } 1607 }
1677 else
1678 sprintf (buf, " ");
1679 } 1608 }
1680 1609
1681 if (level == 5 && RANDOM () % 2) 1610 if (level == 5 && rndm (2))
1682 { /* aligned race, summoning */ 1611 { /* aligned race, summoning */
1683 const char *race = god->race; /* aligned race */ 1612 const char *race = god->race; /* aligned race */
1613 int i;
1684 1614
1685 if (race && !(god->path_denied & PATH_SUMMON)) 1615 if (race && !(god->path_denied & PATH_SUMMON))
1686 if ((i = nstrtok (race, ",")) > 0) 1616 if ((i = nstrtok (race, ",")) > 0)
1687 { 1617 {
1688 char tmpbuf[MAX_BUF]; 1618 buf << "Creatures sacred to " << name << " include the ";
1689
1690 sprintf (buf, "Creatures sacred to %s include the \n", name);
1691 if (i > 1) 1619 if (i > 1)
1692 sprintf (tmpbuf, "following \n races:%s", strtoktolin (race, ",")); 1620 buf << "following races:" << strtoktolin (race, ",");
1693 else 1621 else
1694 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1622 buf << "race of" << strtoktolin (race, ",");
1695 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1623
1624 buf << '\r';
1696 } 1625 }
1697 } 1626 }
1698 1627
1699 if (level == 6 && RANDOM () % 2) 1628 if (level == 6 && rndm (2))
1700 { /* blessing,curse properties of the god */ 1629 { /* blessing,curse properties of the god */
1701 char tmpbuf[MAX_BUF];
1702
1703 if (const char *cp = describe_resistance (god, 1)) 1630 if (const char *cp = describe_resistance (god, 1))
1704 { /* This god does have protections */ 1631 { /* This god does have protections */
1705 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name); 1632 buf << "The priests of " << name
1633 << " are known to be able to "
1706 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1634 "bestow a blessing which makes the recipient "
1707 strcat (tmpbuf, cp); 1635 << cp
1708 strcat (buf, tmpbuf); 1636 << '\r';
1709 strcat (buf, "\n ---\n");
1710 } 1637 }
1711 else
1712 sprintf (buf, " ");
1713
1714 } 1638 }
1715 1639
1716 if (level == 8 && RANDOM () % 2) 1640 if (level == 8 && rndm (2))
1717 { /* immunity, holy possession */ 1641 { /* immunity, holy possession */
1718 int has_effect = 0, tmpvar; 1642 buf << "The priests of " << name
1719 char tmpbuf[MAX_BUF]; 1643 << " are known to make cast a mighty"
1644 " prayer of possession";
1645
1646 int first = 1;
1720 1647
1721 sprintf (tmpbuf, "\n");
1722 sprintf (tmpbuf, "The priests of %s are known to make cast a mighty \n", name);
1723
1724 strcat (tmpbuf, "prayer of possession which gives the recipient\n");
1725
1726 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++) 1648 for (int i = 0; i < NROFATTACKS; i++)
1649 if (god->resist[i] == 100)
1727 { 1650 {
1728 if (god->resist[tmpvar] == 100) 1651 if (first)
1729 { 1652 {
1653 buf << " which gives the recipient";
1730 has_effect = 1; 1654 first = 0;
1731 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1732 } 1655 }
1656 else
1657 buf << ", ";
1658
1659 buf << " immunity to " << attacktype_desc[i];
1733 } 1660 }
1734 1661
1735 if (has_effect) 1662 buf << ".\r";
1736 {
1737 strcat (buf, tmpbuf);
1738 strcat (buf, "\n ---\n");
1739 }
1740 else
1741 sprintf (buf, " ");
1742 } 1663 }
1743 1664
1744 if (level == 12 && RANDOM () % 2) 1665 if (level == 12 && rndm (2))
1745 { /* spell paths */ 1666 { /* spell paths */
1667 //TODO:
1746 int has_effect = 0, tmpvar; 1668 int has_effect = 0, tmpvar;
1747 char tmpbuf[MAX_BUF]; 1669 char tmpbuf[MAX_BUF];
1748 1670
1749 sprintf (tmpbuf, "\n"); 1671 sprintf (tmpbuf, "\n");
1750 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1672 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
… …
1767 has_effect = 1; 1689 has_effect = 1;
1768 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1690 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1769 } 1691 }
1770 1692
1771 if (has_effect) 1693 if (has_effect)
1772 { 1694 buf << tmpbuf << '\r';
1773 strcat (buf, tmpbuf);
1774 strcat (buf, "\n ---\n");
1775 }
1776 else 1695 else
1777 sprintf (buf, " "); 1696 buf << '\r';
1778 } 1697 }
1779 1698
1780 /* check to be sure new buffer size dont exceed either
1781 * the maximum buffer size, or the 'natural' size of the
1782 * book...
1783 */
1784 if (book_overflow (retbuf, buf, booksize))
1785 break;
1786 else if (strlen (buf) > 1)
1787 strcat (retbuf, buf);
1788
1789 level--; 1699 level--;
1790 } 1700 }
1791 1701
1792 if (strlen (retbuf) == introlen) 1702 if (buf.size () == introlen)
1793 { /* we got no information beyond the preamble! */ 1703 /* we got no information beyond the preamble! */
1794 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1704 buf << "[Unfortunately the rest of the information is hopelessly garbled!]";
1795 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1705
1796 }
1797#ifdef BOOK_MSG_DEBUG
1798 LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf));
1799 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1800#endif
1801 return retbuf; 1706 return buf;
1802} 1707}
1803 1708
1804/* tailor_readable_ob()- The main routine. This chooses a random 1709/* tailor_readable_ob()- The main routine. This chooses a random
1805 * message to put in given readable object (type==BOOK) which will 1710 * message to put in given readable object (type==BOOK) which will
1806 * be referred hereafter as a 'book'. We use the book level to de- 1711 * be referred hereafter as a 'book'. We use the book level to de-
… …
1818 * 1723 *
1819 */ 1724 */
1820void 1725void
1821tailor_readable_ob (object *book, int msg_type) 1726tailor_readable_ob (object *book, int msg_type)
1822{ 1727{
1823 char msgbuf[BOOK_BUF];
1824 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1728 int level = book->level ? rndm (book->level) + 1 : 1;
1825 int book_buf_size;
1826 1729
1827 /* safety */ 1730 /* safety */
1828 if (book->type != BOOK) 1731 if (book->type != BOOK)
1829 return; 1732 return;
1830 1733
1831 if (level <= 0) 1734 if (level <= 0)
1832 return; /* if no level no point in doing any more... */ 1735 return; /* if no level no point in doing any more... */
1833
1834 /* Max text length this book can have. */
1835 book_buf_size = BOOKSIZE (book);
1836 1736
1837 /* &&& The message switch &&& */ 1737 /* &&& The message switch &&& */
1838 /* Below all of the possible types of messages in the "book"s. 1738 /* Below all of the possible types of messages in the "book"s.
1839 */ 1739 */
1840 /* 1740 /*
… …
1843 * 2) make sure there is an entry in max_titles[] array. 1743 * 2) make sure there is an entry in max_titles[] array.
1844 * 3) make sure there are entries for your case in new_text_title() 1744 * 3) make sure there are entries for your case in new_text_title()
1845 * and add_authour(). 1745 * and add_authour().
1846 * 4) you may want separate authour/book name arrays in read.h 1746 * 4) you may want separate authour/book name arrays in read.h
1847 */ 1747 */
1848 1748 const char *new_msg = "";
1849 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1749 msg_type = msg_type > 0 ? msg_type : rndm (8);
1850 switch (msg_type) 1750 switch (msg_type)
1851 { 1751 {
1852 case 1: /* monster attrib */ 1752 case 1: /* monster attrib */
1853 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1753 new_msg = mon_info_msg (level);
1854 break; 1754 break;
1855 case 2: /* artifact attrib */ 1755 case 2: /* artifact attrib */
1856 strcpy (msgbuf, artifact_msg (level, book_buf_size)); 1756 new_msg = artifact_msg (level);
1857 break; 1757 break;
1858 case 3: /* grouping incantations/prayers by path */ 1758 case 3: /* grouping incantations/prayers by path */
1859 strcpy (msgbuf, spellpath_msg (level, book_buf_size)); 1759 new_msg = spellpath_msg (level);
1860 break; 1760 break;
1861 case 4: /* describe an alchemy formula */ 1761 case 4: /* describe an alchemy formula */
1862 make_formula_book (book, level); 1762 make_formula_book (book, level);
1863 /* make_formula_book already gives title */ 1763 /* make_formula_book already gives title */
1864 return; 1764 return;
1865 break;
1866 case 5: /* bits of information about a god */ 1765 case 5: /* bits of information about a god */
1867 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1766 new_msg = god_info_msg (level);
1868 break; 1767 break;
1869 case 0: /* use info list in lib/ */ 1768 case 0: /* use info list in lib/ */
1870 default: 1769 default:
1871 cfperl_make_book (book, level); 1770 cfperl_make_book (book, level);
1771 /* already gives title */
1872 return; 1772 return;
1873 } 1773 }
1874 1774
1875 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1876
1877 if (strlen (msgbuf) > 1) 1775 if (strlen (new_msg) > 1)
1878 { 1776 {
1879 book->msg = msgbuf; 1777 book->msg = new_msg;
1880 /* lets give the "book" a new name, which may be a compound word */ 1778 /* lets give the "book" a new name, which may be a compound word */
1881 change_book (book, msg_type); 1779 change_book (book, msg_type);
1882 } 1780 }
1883
1884} 1781}
1885
1886
1887/*****************************************************************************
1888 *
1889 * Cleanup routine for readble stuff.
1890 *
1891 *****************************************************************************/
1892
1893void
1894free_all_readable (void)
1895{
1896 titlelist *tlist, *tnext;
1897 title *title1, *titlenext;
1898 linked_char *lmsg, *nextmsg;
1899 objectlink *monlink, *nextmon;
1900
1901 LOG (llevDebug, "freeing all book information\n");
1902
1903 for (tlist = booklist; tlist != NULL; tlist = tnext)
1904 {
1905 tnext = tlist->next;
1906
1907 for (title1 = tlist->first_book; title1; title1 = titlenext)
1908 {
1909 titlenext = title1->next;
1910 delete title1;
1911 }
1912
1913 delete tlist;
1914 }
1915
1916 for (lmsg = first_msg; lmsg; lmsg = nextmsg)
1917 {
1918 nextmsg = lmsg->next;
1919 delete lmsg;
1920 }
1921
1922 for (monlink = first_mon_info; monlink; monlink = nextmon)
1923 {
1924 nextmon = monlink->next;
1925 delete monlink;
1926 }
1927}
1928
1929 1782
1930/***************************************************************************** 1783/*****************************************************************************
1931 * 1784 *
1932 * Writeback routine for updating the bookarchive. 1785 * Writeback routine for updating the bookarchive.
1933 * 1786 *
1934 ****************************************************************************/ 1787 ****************************************************************************/
1935
1936/* write_book_archive() - write out the updated book archive */ 1788/* write_book_archive() - write out the updated book archive */
1937
1938void 1789void
1939write_book_archive (void) 1790write_book_archive ()
1940{ 1791{
1941 FILE *fp; 1792 FILE *fp;
1942 int index = 0; 1793 int index = 0;
1943 char fname[MAX_BUF]; 1794 char fname[MAX_BUF];
1944 title *book = NULL; 1795 title *book = NULL;
1945 titlelist *bl = get_titlelist (0); 1796 titlelist *bl = get_titlelist (0);
1946 1797
1947 /* If nothing changed, don't write anything */ 1798 /* If nothing changed, don't write anything */
1948 if (!need_to_write_bookarchive) 1799 if (!need_to_write_bookarchive)
1949 return; 1800 return;
1801
1950 need_to_write_bookarchive = 0; 1802 need_to_write_bookarchive = 0;
1951 1803
1952 sprintf (fname, "%s/bookarch", settings.localdir); 1804 sprintf (fname, "%s/bookarch", settings.localdir);
1953 LOG (llevDebug, "Updating book archive: %s...\n", fname); 1805 LOG (llevDebug, "Updating book archive: %s...\n", fname);
1954 1806
1955 if ((fp = fopen (fname, "w")) == NULL) 1807 if ((fp = fopen (fname, "w")) == NULL)
1956 {
1957 LOG (llevDebug, "Can't open book archive file %s\n", fname); 1808 LOG (llevDebug, "Can't open book archive file %s\n", fname);
1958 }
1959 else 1809 else
1960 { 1810 {
1961 while (bl) 1811 while (bl)
1962 { 1812 {
1963 for (book = bl->first_book; book; book = book->next) 1813 for (book = bl->first_book; book; book = book->next)
… …
1970 fprintf (fp, "type %d\n", index); 1820 fprintf (fp, "type %d\n", index);
1971 fprintf (fp, "size %d\n", book->size); 1821 fprintf (fp, "size %d\n", book->size);
1972 fprintf (fp, "index %d\n", book->msg_index); 1822 fprintf (fp, "index %d\n", book->msg_index);
1973 fprintf (fp, "end\n"); 1823 fprintf (fp, "end\n");
1974 } 1824 }
1825
1975 bl = bl->next; 1826 bl = bl->next;
1976 index++; 1827 index++;
1977 } 1828 }
1829
1978 fclose (fp); 1830 fclose (fp);
1979 chmod (fname, SAVE_MODE); 1831 chmod (fname, SAVE_MODE);
1980 } 1832 }
1981} 1833}
1834
1982readable_message_type * 1835readable_message_type *
1983get_readable_message_type (object *readable) 1836get_readable_message_type (object *readable)
1984{ 1837{
1985 uint8 subtype = readable->subtype; 1838 uint8 subtype = readable->subtype;
1986 1839

Diff Legend

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