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

Diff Legend

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