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.15 by pippijn, Wed Jan 3 00:08:17 2007 UTC vs.
Revision 1.28 by root, Sun Jun 24 04:09:28 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 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 */
28 28
… …
110 * pointers to all (hostile) monster objects */ 110 * pointers to all (hostile) monster objects */
111 111
112static int nrofmon = 0, need_to_write_bookarchive = 0; 112static int nrofmon = 0, need_to_write_bookarchive = 0;
113 113
114 114
115/* this is needed to keep track of status of initialization 115/* this is needed to keep track of status of initialisation
116 * of the message file */ 116 * of the message file */
117static int nrofmsg = 0; 117static int nrofmsg = 0;
118 118
119/* first_msg is the started of the linked list of messages as read from 119/* first_msg is the started of the linked list of messages as read from
120 * the messages file 120 * the messages file
… …
187 {"Shield", SHIELD}, 187 {"Shield", SHIELD},
188 {"Bracers", BRACERS}, 188 {"Bracers", BRACERS},
189 {"Boots", BOOTS}, 189 {"Boots", BOOTS},
190 {"Cloak", CLOAK}, 190 {"Cloak", CLOAK},
191 {"Gloves", GLOVES}, 191 {"Gloves", GLOVES},
192 {"Gridle", GIRDLE}, 192 {"Girdle", GIRDLE},
193 {"Ring", RING}, 193 {"Ring", RING},
194 {"Horn", HORN}, 194 {"Horn", HORN},
195 {"Missile Weapon", BOW}, 195 {"Missile Weapon", BOW},
196 {"Missile", ARROW}, 196 {"Missile", ARROW},
197 {"Hand Weapon", WEAPON}, 197 {"Hand Weapon", WEAPON},
… …
435 * Be careful to keep the order. If you add readable subtype, add them 435 * Be careful to keep the order. If you add readable subtype, add them
436 * at the bottom of the list. Never delete a subtype because index is used as 436 * at the bottom of the list. Never delete a subtype because index is used as
437 * subtype paramater in arch files! 437 * subtype paramater in arch files!
438 */ 438 */
439static readable_message_type readable_message_types[] = { 439static readable_message_type readable_message_types[] = {
440 /*subtype 0 */ {0, 0}, 440 /*subtype 0 */ {0, 0, ""},
441 /* book messages subtypes */ 441 /* book messages subtypes */
442 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1}, 442 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1, "readable-book-clasp-1"},
443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2}, 443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2, "readable-book-clasp-2"},
444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1}, 444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1, "readable-book-elegant-1"},
445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2}, 445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2, "readable-book-elegant-2"},
446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1}, 446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1, "readable-book-quarto-1"},
447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2}, 447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2, "readable-book-quarto-2"},
448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER}, 448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER, "readable-book-spell-evocation"},
449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER}, 449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER, "readable-book-spell-praying"},
450 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO}, 450 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO, "readable-book-spell-pyromancy"},
451 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER}, 451 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER, "readable-book-spell-sorcery"},
452 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER}, 452 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER, "readable-book-spell-summoning"},
453 /* card messages subtypes */ 453 /* card messages subtypes */
454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1}, 454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1, "readable-card-simple-1"},
455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2}, 455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2, "readable-card-simple-2"},
456 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3}, 456 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3, "readable-card-simple-3"},
457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1}, 457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1, "readable-card-elegant-1"},
458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2}, 458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2, "readable-card-elegant-2"},
459 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3}, 459 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3, "readable-card-elegant-3"},
460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1}, 460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1, "readable-card-strange-1"},
461 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2}, 461 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2, "readable-card-strange-2"},
462 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3}, 462 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3, "readable-card-strange-3"},
463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1}, 463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1, "readable-card-money-1"},
464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2}, 464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2, "readable-card-money-2"},
465 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3}, 465 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3, "readable-card-money-3"},
466 466
467 /* Paper messages subtypes */ 467 /* Paper messages subtypes */
468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1}, 468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1, "readable-paper-note-1"},
469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2}, 469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2, "readable-paper-note-2"},
470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3}, 470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3, "readable-paper-note-3"},
471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1}, 471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1, "readable-paper-letter-old-1"},
472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2}, 472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2, "readable-paper-letter-old-2"},
473 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1}, 473 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1, "readable-paper-letter-new-1"},
474 /*subtype 30 */ {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_2}, 474 /*subtype 30 */ {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_2, "readable-paper-letter-new-2"},
475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1}, 475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1, "readable-paper-envelope-1"},
476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2}, 476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2, "readable-paper-envelope-2"},
477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1}, 477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1, "readable-paper-scroll-old-1"},
478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2}, 478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2, "readable-paper-scroll-old-2"},
479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1}, 479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1, "readable-paper-scroll-new-1"},
480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2}, 480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2, "readable-paper-scroll-new-2"},
481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC}, 481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC, "readable-paper-scroll-magic"},
482 482
483 /* road signs messages subtypes */ 483 /* road signs messages subtypes */
484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC}, 484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC, "readable-sign-basic"},
485 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT}, 485 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT, "readable-sign-dir-left"},
486 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT}, 486 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT, "readable-sign-dir-right"},
487 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH}, 487 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH, "readable-sign-dir-both"},
488 488
489 /* stones and monument messages */ 489 /* stones and monument messages */
490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1}, 490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1, "readable-monument-stone-1"},
491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2}, 491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2, "readable-monument-stone-2"},
492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3}, 492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3, "readable-monument-stone-3"},
493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1}, 493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1, "readable-monument-statue-1"},
494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2}, 494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2, "readable-monument-statue-2"},
495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3}, 495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3, "readable-monument-statue-3"},
496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1}, 496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1, "readable-monument-gravestone-1"},
497 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2}, 497 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2, "readable-monument-gravestone-2"},
498 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3}, 498 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"},
499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1}, 499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2}, 500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3} 501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
502}; 502};
503int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 503int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
504 504
505static int max_titles[6] = { 505static int max_titles[6] = {
506 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)), 506 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)),
… …
636 636
637} 637}
638 638
639/***************************************************************************** 639/*****************************************************************************
640 * 640 *
641 * Start of initialization related functions. 641 * Start of initialisation related functions.
642 * 642 *
643 ****************************************************************************/ 643 ****************************************************************************/
644 644
645/* init_msgfile() - if not called before, initialize the info list
646 * reads the messages file into the list pointed to by first_msg
647*/
648
649static void
650init_msgfile (void)
651{
652 FILE *fp;
653 char buf[MAX_BUF], msgbuf[HUGE_BUF], fname[MAX_BUF], *cp;
654 int comp;
655 static int did_init_msgfile;
656
657 if (did_init_msgfile)
658 return;
659 did_init_msgfile = 1;
660
661 sprintf (fname, "%s/messages", settings.datadir);
662 LOG (llevDebug, "Reading messages from %s...\n", fname);
663
664 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
665 {
666 linked_char *tmp = NULL;
667
668 while (fgets (buf, MAX_BUF, fp) != NULL)
669 {
670 if (*buf == '#')
671 continue;
672 if ((cp = strchr (buf, '\n')) != NULL)
673 *cp = '\0';
674 cp = buf;
675 while (*cp == ' ') /* Skip blanks */
676 cp++;
677 if (!strncmp (cp, "ENDMSG", 6))
678 {
679 if (strlen (msgbuf) > BOOK_BUF)
680 {
681 LOG (llevDebug, "Warning: this string exceeded max book buf size:");
682 LOG (llevDebug, " %s\n", msgbuf);
683 }
684 tmp->name = msgbuf;
685 tmp->next = first_msg;
686 first_msg = tmp;
687 nrofmsg++;
688 continue;
689 }
690 else if (!strncmp (cp, "MSG", 3))
691 {
692 tmp = new linked_char;
693
694 strcpy (msgbuf, " "); /* reset msgbuf for new message */
695 continue;
696 }
697 else if (!buf_overflow (msgbuf, cp, HUGE_BUF - 1))
698 {
699 strcat (msgbuf, cp);
700 strcat (msgbuf, "\n");
701 }
702 }
703 close_and_delete (fp, comp);
704 }
705
706#ifdef BOOK_MSG_DEBUG
707 LOG (llevDebug, "init_info_listfile() got %d messages.\n", nrofmsg);
708#endif
709 LOG (llevDebug, "done.\n");
710}
711
712
713/* init_book_archive() - if not called before, initialize the info list 645/* init_book_archive() - if not called before, initialise the info list
714 * This reads in the bookarch file into memory. bookarch is the file 646 * This reads in the bookarch file into memory. bookarch is the file
715 * created and updated across multiple runs of the program. 647 * created and updated across multiple runs of the program.
716 */ 648 */
717
718static void 649static void
719init_book_archive (void) 650init_book_archive (void)
720{ 651{
721 FILE *fp; 652 FILE *fp;
722 int comp, nroftitle = 0; 653 int comp, nroftitle = 0;
… …
817 if (did_init_mon_info) 748 if (did_init_mon_info)
818 return; 749 return;
819 750
820 did_init_mon_info = 1; 751 did_init_mon_info = 1;
821 752
822 753 for_all_archetypes (at)
823 for (at = first_archetype; at != NULL; at = at->next)
824 { 754 {
825 if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE))) 755 if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE)))
826 { 756 {
827 objectlink *mon = new objectlink; 757 objectlink *mon = new objectlink;
828 758
829 mon->ob = &at->clone; 759 mon->ob = at;
830 mon->next = first_mon_info; 760 mon->next = first_mon_info;
831 first_mon_info = mon; 761 first_mon_info = mon;
832 nrofmon++; 762 nrofmon++;
833 } 763 }
834 } 764 }
835 765
836 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 766 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
837} 767}
838 768
839
840/* init_readable() - initialize linked lists utilized by 769/* init_readable() - initialise linked lists utilized by
841 * message functions in tailor_readable_ob() 770 * message functions in tailor_readable_ob()
842 * 771 *
843 * This is the function called by the main routine to initialize 772 * This is the function called by the main routine to initialise
844 * all the readable information. 773 * all the readable information.
845 */ 774 */
846
847void 775void
848init_readable (void) 776init_readable (void)
849{ 777{
850 static int did_this; 778 static int did_this;
851 779
… …
853 return; 781 return;
854 782
855 did_this = 1; 783 did_this = 1;
856 784
857 LOG (llevDebug, "Initialising reading data...\n"); 785 LOG (llevDebug, "Initialising reading data...\n");
858 init_msgfile ();
859 init_book_archive (); 786 init_book_archive ();
860 init_mon_info (); 787 init_mon_info ();
861 LOG (llevDebug, " Done\n"); 788 LOG (llevDebug, " Done\n");
862
863} 789}
864 790
865/***************************************************************************** 791/*****************************************************************************
866 * 792 *
867 * This is the start of the administrative functions when creating 793 * This is the start of the administrative functions when creating
868 * new books (ie, updating title and the like) 794 * new books (ie, updating title and the like)
869 * 795 *
870 *****************************************************************************/ 796 *****************************************************************************/
871 797
872
873/* find_title() - Search the titlelist (based on msgtype) to see if 798/* find_title() - Search the titlelist (based on msgtype) to see if
874 * book matches something already there. IF so, return that title. 799 * book matches something already there. IF so, return that title.
875 */ 800 */
876
877static title * 801static title *
878find_title (const object *book, int msgtype) 802find_title (const object *book, int msgtype)
879{ 803{
880 title *t = NULL; 804 title *t = NULL;
881 titlelist *tl = get_titlelist (msgtype); 805 titlelist *tl = get_titlelist (msgtype);
… …
918 if (book->type != BOOK) 842 if (book->type != BOOK)
919 return; 843 return;
920 844
921 switch (msgtype) 845 switch (msgtype)
922 { 846 {
923 case 1: /*monster */ 847 case 1: /*monster */
924 nbr = sizeof (mon_book_name) / sizeof (char *); 848 nbr = sizeof (mon_book_name) / sizeof (char *);
925 strcpy (name, mon_book_name[RANDOM () % nbr]); 849 assign (name, mon_book_name[rndm (nbr)]);
926 break; 850 break;
927 case 2: /*artifact */ 851 case 2: /*artifact */
928 nbr = sizeof (art_book_name) / sizeof (char *); 852 nbr = sizeof (art_book_name) / sizeof (char *);
929 strcpy (name, art_book_name[RANDOM () % nbr]); 853 assign (name, art_book_name[rndm (nbr)]);
930 break; 854 break;
931 case 3: /*spellpath */ 855 case 3: /*spellpath */
932 nbr = sizeof (path_book_name) / sizeof (char *); 856 nbr = sizeof (path_book_name) / sizeof (char *);
933 strcpy (name, path_book_name[RANDOM () % nbr]); 857 assign (name, path_book_name[rndm (nbr)]);
934 break; 858 break;
935 case 4: /*alchemy */ 859 case 4: /*alchemy */
936 nbr = sizeof (formula_book_name) / sizeof (char *); 860 nbr = sizeof (formula_book_name) / sizeof (char *);
937 strcpy (name, formula_book_name[RANDOM () % nbr]); 861 assign (name, formula_book_name[rndm (nbr)]);
938 break; 862 break;
939 case 5: /*gods */ 863 case 5: /*gods */
940 nbr = sizeof (gods_book_name) / sizeof (char *); 864 nbr = sizeof (gods_book_name) / sizeof (char *);
941 strcpy (name, gods_book_name[RANDOM () % nbr]); 865 assign (name, gods_book_name[rndm (nbr)]);
942 break; 866 break;
943 case 6: /*msg file */ 867 case 6: /*msg file */
944 default: 868 default:
945 if (book->weight > 2000) 869 if (book->weight > 2000)
946 { /* based on weight */ 870 { /* based on weight */
947 nbr = sizeof (heavy_book_name) / sizeof (char *); 871 nbr = sizeof (heavy_book_name) / sizeof (char *);
948 strcpy (name, heavy_book_name[RANDOM () % nbr]); 872 assign (name, heavy_book_name[rndm (nbr)]);
949 } 873 }
950 else if (book->weight < 2001) 874 else if (book->weight < 2001)
951 { 875 {
952 nbr = sizeof (light_book_name) / sizeof (char *); 876 nbr = sizeof (light_book_name) / sizeof (char *);
953 strcpy (name, light_book_name[RANDOM () % nbr]); 877 assign (name, light_book_name[rndm (nbr)]);
954 } 878 }
955 break; 879 break;
956 } 880 }
957 881
958 book->name = name; 882 book->name = name;
959} 883}
960 884
… …
972 if (msgtype < 0 || strlen (op->msg) < 5) 896 if (msgtype < 0 || strlen (op->msg) < 5)
973 return; 897 return;
974 898
975 switch (msgtype) 899 switch (msgtype)
976 { 900 {
977 case 1: /* monster */ 901 case 1: /* monster */
978 nbr = sizeof (mon_author) / sizeof (char *); 902 nbr = sizeof (mon_author) / sizeof (char *);
979 strcpy (name, mon_author[RANDOM () % nbr]); 903 assign (name, mon_author[rndm (nbr)]);
980 break; 904 break;
981 case 2: /* artifacts */ 905 case 2: /* artifacts */
982 nbr = sizeof (art_author) / sizeof (char *); 906 nbr = sizeof (art_author) / sizeof (char *);
983 strcpy (name, art_author[RANDOM () % nbr]); 907 assign (name, art_author[rndm (nbr)]);
984 break; 908 break;
985 case 3: /* spellpath */ 909 case 3: /* spellpath */
986 nbr = sizeof (path_author) / sizeof (char *); 910 nbr = sizeof (path_author) / sizeof (char *);
987 strcpy (name, path_author[RANDOM () % nbr]); 911 assign (name, path_author[rndm (nbr)]);
988 break; 912 break;
989 case 4: /* alchemy */ 913 case 4: /* alchemy */
990 nbr = sizeof (formula_author) / sizeof (char *); 914 nbr = sizeof (formula_author) / sizeof (char *);
991 strcpy (name, formula_author[RANDOM () % nbr]); 915 assign (name, formula_author[rndm (nbr)]);
992 break; 916 break;
993 case 5: /* gods */ 917 case 5: /* gods */
994 nbr = sizeof (gods_author) / sizeof (char *); 918 nbr = sizeof (gods_author) / sizeof (char *);
995 strcpy (name, gods_author[RANDOM () % nbr]); 919 assign (name, gods_author[rndm (nbr)]);
996 break; 920 break;
997 case 6: /* msg file */ 921 case 6: /* msg file */
998 default: 922 default:
999 strcpy (name, book_author[RANDOM () % nbr]); 923 assign (name, book_author[rndm (nbr)]);
1000 } 924 }
1001 925
1002 sprintf (title, "of %s", name); 926 sprintf (title, "of %s", name);
1003 op->title = title; 927 op->title = title;
1004} 928}
… …
1044 t = get_empty_book (); 968 t = get_empty_book ();
1045 t->name = book->name; 969 t->name = book->name;
1046 t->authour = book->title; 970 t->authour = book->title;
1047 t->size = strlen (book->msg); 971 t->size = strlen (book->msg);
1048 t->msg_index = strtoint (book->msg); 972 t->msg_index = strtoint (book->msg);
1049 t->archname = book->arch->name; 973 t->archname = book->arch->archname;
1050 t->level = book->level; 974 t->level = book->level;
1051 975
1052 t->next = tl->first_book; 976 t->next = tl->first_book;
1053 tl->first_book = t; 977 tl->first_book = t;
1054 tl->number++; 978 tl->number++;
… …
1168 if (RANDOM () % 4) 1092 if (RANDOM () % 4)
1169 { 1093 {
1170 /* Lets give the book a description to individualize it some */ 1094 /* Lets give the book a description to individualize it some */
1171 char new_name[MAX_BUF]; 1095 char new_name[MAX_BUF];
1172 1096
1173 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[RANDOM () % nbr], old_name); 1097 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1174 1098
1175 book->name = new_name; 1099 book->name = new_name;
1176 } 1100 }
1177 else 1101 else
1178 { 1102 {
… …
1367 ****************************************************************************/ 1291 ****************************************************************************/
1368 1292
1369/* artifact_msg() - generate a message detailing the properties 1293/* artifact_msg() - generate a message detailing the properties
1370 * of 1-6 artifacts drawn sequentially from the artifact list. 1294 * of 1-6 artifacts drawn sequentially from the artifact list.
1371 */ 1295 */
1372 1296const char *
1373char *
1374artifact_msg (int level, int booksize) 1297artifact_msg (int level, int booksize)
1375{ 1298{
1376 artifactlist *al = NULL; 1299 artifactlist *al = NULL;
1377 artifact *art; 1300 artifact *art;
1378 int chance, i, type, index; 1301 int chance, i, type, index;
1379 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1302 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1;
1303 const char *ch;
1380 char *ch, name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1304 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1381 static char retbuf[BOOK_BUF]; 1305 static char retbuf[BOOK_BUF];
1382 object *tmp = NULL; 1306 object *tmp = NULL;
1383 1307
1384 /* values greater than 5 create msg buffers that are too big! */ 1308 /* values greater than 5 create msg buffers that are too big! */
1385 if (book_entries > 5) 1309 if (book_entries > 5)
… …
1399 i++; 1323 i++;
1400 } 1324 }
1401 while ((al == NULL) && (i < 10)); 1325 while ((al == NULL) && (i < 10));
1402 1326
1403 if (i == 10) /* Unable to find a message */ 1327 if (i == 10) /* Unable to find a message */
1404 return ("None"); 1328 return "None";
1405 1329
1406 /* There is no reason to start on the artifact list at the begining. Lets 1330 /* There is no reason to start on the artifact list at the begining. Lets
1407 * take our starting position randomly... */ 1331 * take our starting position randomly... */
1408 art = al->items; 1332 art = al->items;
1409 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1333 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--)
… …
1412 art = al->items; /* hmm, out of stuff, loop back around */ 1336 art = al->items; /* hmm, out of stuff, loop back around */
1413 art = art->next; 1337 art = art->next;
1414 } 1338 }
1415 1339
1416 /* the base 'generic' name for our artifact */ 1340 /* the base 'generic' name for our artifact */
1417 strcpy (name, art_name_array[index].name); 1341 assign (name, art_name_array[index].name);
1418 1342
1419 /* Ok, lets print out the contents */ 1343 /* Ok, lets print out the contents */
1420 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1344 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact");
1421 1345
1422 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1346 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
… …
1517 if (path == -1) 1441 if (path == -1)
1518 strcat (retbuf, "having no known spell path.\n"); 1442 strcat (retbuf, "having no known spell path.\n");
1519 else 1443 else
1520 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1444 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]);
1521 1445
1522 for (at = first_archetype; at != NULL; at = at->next) 1446 for_all_archetypes (at)
1523 { 1447 {
1524 /* Determine if this is an appropriate spell. Must 1448 /* Determine if this is an appropriate spell. Must
1525 * be of matching path, must be of appropriate type (prayer 1449 * be of matching path, must be of appropriate type (prayer
1526 * or not), and must be within the valid level range. 1450 * or not), and must be within the valid level range.
1527 */ 1451 */
1528 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1452 if (at->type == SPELL && at->path_attuned & pnum &&
1529 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8))) 1453 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1530 { 1454 {
1531 strcpy (tmpbuf, at->clone.name); 1455 assign (tmpbuf, at->object::name);
1532 1456
1533 if (book_overflow (retbuf, tmpbuf, booksize)) 1457 if (book_overflow (retbuf, tmpbuf, booksize))
1534 break; 1458 break;
1535 else 1459 else
1536 { 1460 {
… …
1554 strcat (retbuf, "\n"); 1478 strcat (retbuf, "\n");
1555 } 1479 }
1556 return retbuf; 1480 return retbuf;
1557} 1481}
1558 1482
1559
1560
1561/* formula_msg() - generate a message detailing the properties 1483/* formula_msg() - generate a message detailing the properties
1562 * of a randomly selected alchemical formula. 1484 * of a randomly selected alchemical formula.
1563 */ 1485 */
1564
1565void 1486void
1566make_formula_book (object *book, int level) 1487make_formula_book (object *book, int level)
1567{ 1488{
1568 char retbuf[BOOK_BUF], title[MAX_BUF]; 1489 char retbuf[BOOK_BUF], title[MAX_BUF];
1569 recipelist *fl; 1490 recipelist *fl;
… …
1613 1534
1614 /* preamble */ 1535 /* preamble */
1615 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1536 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1616 1537
1617 if ((at = archetype::find (op_name)) != (archetype *) NULL) 1538 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1618 op_name = at->clone.name; 1539 op_name = at->object::name;
1619 else 1540 else
1620 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1541 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1621 1542
1622 /* item name */ 1543 /* item name */
1623 if (strcmp (formula->title, "NONE")) 1544 if (strcmp (formula->title, "NONE"))
… …
1633 } 1554 }
1634 else 1555 else
1635 { 1556 {
1636 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1557 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1637 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1558 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name);
1638 if (at->clone.title) 1559 if (at->title)
1639 { 1560 {
1640 strcat (retbuf, " "); 1561 strcat (retbuf, " ");
1641 strcat (retbuf, at->clone.title); 1562 strcat (retbuf, at->title);
1642 strcat (title, " "); 1563 strcat (title, " ");
1643 strcat (title, at->clone.title); 1564 strcat (title, at->title);
1644 } 1565 }
1645 } 1566 }
1646 /* Lets name the book something meaningful ! */ 1567 /* Lets name the book something meaningful ! */
1647 book->name = title; 1568 book->name = title;
1648 book->title = NULL; 1569 book->title = NULL;
… …
1654 archetype *at; 1575 archetype *at;
1655 1576
1656 at = archetype::find (formula->cauldron); 1577 at = archetype::find (formula->cauldron);
1657 1578
1658 sprintf (retbuf + strlen (retbuf), 1579 sprintf (retbuf + strlen (retbuf),
1659 " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place"); 1580 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place");
1660 1581
1661 for (next = formula->ingred; next != NULL; next = next->next) 1582 for (next = formula->ingred; next != NULL; next = next->next)
1662 { 1583 {
1663 strcat (retbuf, next->name); 1584 strcat (retbuf, next->name);
1664 strcat (retbuf, "\n"); 1585 strcat (retbuf, "\n");
… …
1671 1592
1672 book->msg = retbuf; 1593 book->msg = retbuf;
1673 } 1594 }
1674} 1595}
1675 1596
1676
1677/* msgfile_msg() - generate a message drawn randomly from a
1678 * file in lib/. Level currently has no effect on the message
1679 * which is returned.
1680 */
1681
1682char *
1683msgfile_msg (int level, int booksize)
1684{
1685 static char retbuf[BOOK_BUF];
1686 int i, msgnum;
1687 linked_char *msg = NULL;
1688
1689 /* get a random message for the 'book' from linked list */
1690 if (nrofmsg > 1)
1691 {
1692 msg = first_msg;
1693 msgnum = RANDOM () % nrofmsg;
1694 for (i = 0; msg && i < nrofmsg && i != msgnum; i++)
1695 msg = msg->next;
1696 }
1697
1698 if (msg && !book_overflow (retbuf, msg->name, booksize))
1699 strcpy (retbuf, msg->name);
1700 else
1701 sprintf (retbuf, "\n <undecipherable text>");
1702
1703#ifdef BOOK_MSG_DEBUG
1704 LOG (llevDebug, "\n info_list_msg() created strng: %d\n", strlen (retbuf));
1705 LOG (llevDebug, " MADE THIS:\n%s\n", retbuf);
1706#endif
1707
1708 return retbuf;
1709}
1710
1711
1712/* god_info_msg() - generate a message detailing the properties 1597/* god_info_msg() - generate a message detailing the properties
1713 * of a random god. Used by the book hack. b.t. 1598 * of a random god. Used by the book hack. b.t.
1714 */ 1599 */
1715
1716const char * 1600const char *
1717god_info_msg (int level, int booksize) 1601god_info_msg (int level, int booksize)
1718{ 1602{
1719 static char retbuf[BOOK_BUF]; 1603 static char retbuf[BOOK_BUF];
1720 const char *name = NULL; 1604 const char *name = NULL;
… …
1756 const char *enemy = god->title; 1640 const char *enemy = god->title;
1757 1641
1758 if (enemy) 1642 if (enemy)
1759 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1643 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1760 } 1644 }
1645
1761 if (level == 3 && RANDOM () % 2) 1646 if (level == 3 && RANDOM () % 2)
1762 { /* enemy race, what the god's holy word effects */ 1647 { /* enemy race, what the god's holy word effects */
1763 const char *enemy = god->slaying; 1648 const char *enemy = god->slaying;
1764 1649
1765 if (enemy && !(god->path_denied & PATH_TURNING)) 1650 if (enemy && !(god->path_denied & PATH_TURNING))
… …
1774 else 1659 else
1775 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1660 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1776 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1661 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1777 } 1662 }
1778 } 1663 }
1664
1779 if (level == 4 && RANDOM () % 2) 1665 if (level == 4 && RANDOM () % 2)
1780 { /* Priest of god gets these protect,vulnerable... */ 1666 { /* Priest of god gets these protect,vulnerable... */
1781 char tmpbuf[MAX_BUF], *cp; 1667 char tmpbuf[MAX_BUF];
1782 1668
1783 cp = describe_resistance (god, 1); 1669 if (const char *cp = describe_resistance (god, 1))
1784
1785 if (*cp)
1786 { /* This god does have protections */ 1670 { /* This god does have protections */
1787 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1671 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name);
1788 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1672 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n");
1789 strcat (tmpbuf, cp); 1673 strcat (tmpbuf, cp);
1790 strcat (buf, tmpbuf); 1674 strcat (buf, tmpbuf);
1791 strcat (buf, "\n ---\n"); 1675 strcat (buf, "\n ---\n");
1792 } 1676 }
1793 else 1677 else
1794 sprintf (buf, " "); 1678 sprintf (buf, " ");
1795 } 1679 }
1680
1796 if (level == 5 && RANDOM () % 2) 1681 if (level == 5 && RANDOM () % 2)
1797 { /* aligned race, summoning */ 1682 { /* aligned race, summoning */
1798 const char *race = god->race; /* aligned race */ 1683 const char *race = god->race; /* aligned race */
1799 1684
1800 if (race && !(god->path_denied & PATH_SUMMON)) 1685 if (race && !(god->path_denied & PATH_SUMMON))
… …
1808 else 1693 else
1809 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1694 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1810 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1695 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1811 } 1696 }
1812 } 1697 }
1698
1813 if (level == 6 && RANDOM () % 2) 1699 if (level == 6 && RANDOM () % 2)
1814 { /* blessing,curse properties of the god */ 1700 { /* blessing,curse properties of the god */
1815 char tmpbuf[MAX_BUF], *cp; 1701 char tmpbuf[MAX_BUF];
1816 1702
1817 cp = describe_resistance (god, 1); 1703 if (const char *cp = describe_resistance (god, 1))
1818
1819 if (*cp)
1820 { /* This god does have protections */ 1704 { /* This god does have protections */
1821 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name); 1705 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name);
1822 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1706 strcat (tmpbuf, "bestow a blessing which makes the recipient\n");
1823 strcat (tmpbuf, cp); 1707 strcat (tmpbuf, cp);
1824 strcat (buf, tmpbuf); 1708 strcat (buf, tmpbuf);
… …
1826 } 1710 }
1827 else 1711 else
1828 sprintf (buf, " "); 1712 sprintf (buf, " ");
1829 1713
1830 } 1714 }
1715
1831 if (level == 8 && RANDOM () % 2) 1716 if (level == 8 && RANDOM () % 2)
1832 { /* immunity, holy possession */ 1717 { /* immunity, holy possession */
1833 int has_effect = 0, tmpvar; 1718 int has_effect = 0, tmpvar;
1834 char tmpbuf[MAX_BUF]; 1719 char tmpbuf[MAX_BUF];
1835 1720
… …
1844 { 1729 {
1845 has_effect = 1; 1730 has_effect = 1;
1846 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]); 1731 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1847 } 1732 }
1848 } 1733 }
1734
1849 if (has_effect) 1735 if (has_effect)
1850 { 1736 {
1851 strcat (buf, tmpbuf); 1737 strcat (buf, tmpbuf);
1852 strcat (buf, "\n ---\n"); 1738 strcat (buf, "\n ---\n");
1853 } 1739 }
1854 else 1740 else
1855 sprintf (buf, " "); 1741 sprintf (buf, " ");
1856 } 1742 }
1743
1857 if (level == 12 && RANDOM () % 2) 1744 if (level == 12 && RANDOM () % 2)
1858 { /* spell paths */ 1745 { /* spell paths */
1859 int has_effect = 0, tmpvar; 1746 int has_effect = 0, tmpvar;
1860 char tmpbuf[MAX_BUF]; 1747 char tmpbuf[MAX_BUF];
1861 1748
1862 sprintf (tmpbuf, "\n"); 1749 sprintf (tmpbuf, "\n");
1863 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1750 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
1864 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n"); 1751 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n");
1752
1865 if ((tmpvar = god->path_attuned)) 1753 if ((tmpvar = god->path_attuned))
1866 { 1754 {
1867 has_effect = 1; 1755 has_effect = 1;
1868 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned"); 1756 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned");
1869 } 1757 }
1758
1870 if ((tmpvar = god->path_repelled)) 1759 if ((tmpvar = god->path_repelled))
1871 { 1760 {
1872 has_effect = 1; 1761 has_effect = 1;
1873 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled"); 1762 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled");
1874 } 1763 }
1764
1875 if ((tmpvar = god->path_denied)) 1765 if ((tmpvar = god->path_denied))
1876 { 1766 {
1877 has_effect = 1; 1767 has_effect = 1;
1878 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1768 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1879 } 1769 }
1770
1880 if (has_effect) 1771 if (has_effect)
1881 { 1772 {
1882 strcat (buf, tmpbuf); 1773 strcat (buf, tmpbuf);
1883 strcat (buf, "\n ---\n"); 1774 strcat (buf, "\n ---\n");
1884 } 1775 }
… …
1892 */ 1783 */
1893 if (book_overflow (retbuf, buf, booksize)) 1784 if (book_overflow (retbuf, buf, booksize))
1894 break; 1785 break;
1895 else if (strlen (buf) > 1) 1786 else if (strlen (buf) > 1)
1896 strcat (retbuf, buf); 1787 strcat (retbuf, buf);
1788
1897 level--; 1789 level--;
1898 } 1790 }
1791
1899 if (strlen (retbuf) == introlen) 1792 if (strlen (retbuf) == introlen)
1900 { /* we got no information beyond the preamble! */ 1793 { /* we got no information beyond the preamble! */
1901 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1794 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1902 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1795 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1903 } 1796 }
… …
1922 * book is the object we are creating into. 1815 * book is the object we are creating into.
1923 * If msg_type is a positive value, we use that to determine the 1816 * If msg_type is a positive value, we use that to determine the
1924 * message type - otherwise a random value is used. 1817 * message type - otherwise a random value is used.
1925 * 1818 *
1926 */ 1819 */
1927
1928void 1820void
1929tailor_readable_ob (object *book, int msg_type) 1821tailor_readable_ob (object *book, int msg_type)
1930{ 1822{
1931 char msgbuf[BOOK_BUF]; 1823 char msgbuf[BOOK_BUF];
1932 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1824 int level = book->level ? (RANDOM () % book->level) + 1 : 1;
… …
1955 */ 1847 */
1956 1848
1957 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1849 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6);
1958 switch (msg_type) 1850 switch (msg_type)
1959 { 1851 {
1960 case 1: /* monster attrib */ 1852 case 1: /* monster attrib */
1961 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1853 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1962 break; 1854 break;
1963 case 2: /* artifact attrib */ 1855 case 2: /* artifact attrib */
1964 strcpy (msgbuf, artifact_msg (level, book_buf_size)); 1856 strcpy (msgbuf, artifact_msg (level, book_buf_size));
1965 break; 1857 break;
1966 case 3: /* grouping incantations/prayers by path */ 1858 case 3: /* grouping incantations/prayers by path */
1967 strcpy (msgbuf, spellpath_msg (level, book_buf_size)); 1859 strcpy (msgbuf, spellpath_msg (level, book_buf_size));
1968 break; 1860 break;
1969 case 4: /* describe an alchemy formula */ 1861 case 4: /* describe an alchemy formula */
1970 make_formula_book (book, level); 1862 make_formula_book (book, level);
1971 /* make_formula_book already gives title */ 1863 /* make_formula_book already gives title */
1972 return; 1864 return;
1973 break; 1865 break;
1974 case 5: /* bits of information about a god */ 1866 case 5: /* bits of information about a god */
1975 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1867 strcpy (msgbuf, god_info_msg (level, book_buf_size));
1976 break; 1868 break;
1977 case 0: /* use info list in lib/ */ 1869 case 0: /* use info list in lib/ */
1978 default: 1870 default:
1979 strcpy (msgbuf, msgfile_msg (level, book_buf_size)); 1871 cfperl_make_book (book, level);
1980 break; 1872 return;
1981 } 1873 }
1982 1874
1983 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */ 1875 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1984 1876
1985 if (strlen (msgbuf) > 1) 1877 if (strlen (msgbuf) > 1)

Diff Legend

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