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.39 by root, Wed Dec 31 17:35:37 2008 UTC vs.
Revision 1.64 by root, Fri Jan 27 22:01:46 2012 UTC

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

Diff Legend

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