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.10 by root, Fri Sep 29 21:55:54 2006 UTC vs.
Revision 1.40 by root, Thu Jan 1 11:41:17 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 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 (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 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23
24 23
25/* This file contains code relevant to the BOOKS hack -- designed 24/* This file contains code relevant to the BOOKS hack -- designed
26 * to allow randomly occuring messages in non-magical texts. 25 * to allow randomly occuring messages in non-magical texts.
27 */ 26 */
28 27
… …
110 * pointers to all (hostile) monster objects */ 109 * pointers to all (hostile) monster objects */
111 110
112static int nrofmon = 0, need_to_write_bookarchive = 0; 111static int nrofmon = 0, need_to_write_bookarchive = 0;
113 112
114 113
115/* this is needed to keep track of status of initialization 114/* this is needed to keep track of status of initialisation
116 * of the message file */ 115 * of the message file */
117static int nrofmsg = 0; 116static int nrofmsg = 0;
118 117
119/* first_msg is the started of the linked list of messages as read from 118/* first_msg is the started of the linked list of messages as read from
120 * the messages file 119 * the messages file
… …
187 {"Shield", SHIELD}, 186 {"Shield", SHIELD},
188 {"Bracers", BRACERS}, 187 {"Bracers", BRACERS},
189 {"Boots", BOOTS}, 188 {"Boots", BOOTS},
190 {"Cloak", CLOAK}, 189 {"Cloak", CLOAK},
191 {"Gloves", GLOVES}, 190 {"Gloves", GLOVES},
192 {"Gridle", GIRDLE}, 191 {"Girdle", GIRDLE},
193 {"Ring", RING}, 192 {"Ring", RING},
194 {"Horn", HORN}, 193 {"Horn", HORN},
195 {"Missile Weapon", BOW}, 194 {"Missile Weapon", BOW},
196 {"Missile", ARROW}, 195 {"Missile", ARROW},
197 {"Hand Weapon", WEAPON}, 196 {"Hand Weapon", WEAPON},
… …
435 * Be careful to keep the order. If you add readable subtype, add them 434 * 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 435 * at the bottom of the list. Never delete a subtype because index is used as
437 * subtype paramater in arch files! 436 * subtype paramater in arch files!
438 */ 437 */
439static readable_message_type readable_message_types[] = { 438static readable_message_type readable_message_types[] = {
440 /*subtype 0 */ {0, 0}, 439 /*subtype 0 */ {0, 0, "info"},
441 /* book messages subtypes */ 440 /* book messages subtypes */
442 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1}, 441 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1, "readable-book-clasp-1"},
443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2}, 442 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2, "readable-book-clasp-2"},
444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1}, 443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1, "readable-book-elegant-1"},
445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2}, 444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2, "readable-book-elegant-2"},
446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1}, 445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1, "readable-book-quarto-1"},
447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2}, 446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2, "readable-book-quarto-2"},
448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER}, 447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER, "readable-book-spell-evocation"},
449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER}, 448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER, "readable-book-spell-praying"},
450 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO}, 449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO, "readable-book-spell-pyromancy"},
451 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER}, 450 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER, "readable-book-spell-sorcery"},
452 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER}, 451 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER, "readable-book-spell-summoning"},
453 /* card messages subtypes */ 452 /* card messages subtypes */
454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1}, 453 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1, "readable-card-simple-1"},
455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2}, 454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2, "readable-card-simple-2"},
456 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3}, 455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3, "readable-card-simple-3"},
457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1}, 456 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1, "readable-card-elegant-1"},
458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2}, 457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2, "readable-card-elegant-2"},
459 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3}, 458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3, "readable-card-elegant-3"},
460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1}, 459 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1, "readable-card-strange-1"},
461 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2}, 460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2, "readable-card-strange-2"},
462 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3}, 461 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3, "readable-card-strange-3"},
463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1}, 462 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1, "readable-card-money-1"},
464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2}, 463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2, "readable-card-money-2"},
465 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3}, 464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3, "readable-card-money-3"},
466 465
467 /* Paper messages subtypes */ 466 /* Paper messages subtypes */
468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1}, 467 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1, "readable-paper-note-1"},
469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2}, 468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2, "readable-paper-note-2"},
470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3}, 469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3, "readable-paper-note-3"},
471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1}, 470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1, "readable-paper-letter-old-1"},
472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2}, 471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2, "readable-paper-letter-old-2"},
473 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1}, 472 {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}, 473 /*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}, 474 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1, "readable-paper-envelope-1"},
476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2}, 475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2, "readable-paper-envelope-2"},
477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1}, 476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1, "readable-paper-scroll-old-1"},
478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2}, 477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2, "readable-paper-scroll-old-2"},
479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1}, 478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1, "readable-paper-scroll-new-1"},
480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2}, 479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2, "readable-paper-scroll-new-2"},
481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC}, 480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC, "readable-paper-scroll-magic"},
482 481
483 /* road signs messages subtypes */ 482 /* road signs messages subtypes */
484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC}, 483 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC, "readable-sign-basic"},
485 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT}, 484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT, "readable-sign-dir-left"},
486 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT}, 485 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT, "readable-sign-dir-right"},
487 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH}, 486 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH, "readable-sign-dir-both"},
488 487
489 /* stones and monument messages */ 488 /* stones and monument messages */
490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1}, 489 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1, "readable-monument-stone-1"},
491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2}, 490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2, "readable-monument-stone-2"},
492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3}, 491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3, "readable-monument-stone-3"},
493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1}, 492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1, "readable-monument-statue-1"},
494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2}, 493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2, "readable-monument-statue-2"},
495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3}, 494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3, "readable-monument-statue-3"},
496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1}, 495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1, "readable-monument-gravestone-1"},
497 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2}, 496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2, "readable-monument-gravestone-2"},
498 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3}, 497 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"},
499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1}, 498 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2}, 499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3} 500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
502}; 501};
503int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 502int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
504 503
505static int max_titles[6] = { 504static int max_titles[6] = {
506 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)), 505 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)),
… …
636 635
637} 636}
638 637
639/***************************************************************************** 638/*****************************************************************************
640 * 639 *
641 * Start of initialization related functions. 640 * Start of initialisation related functions.
642 * 641 *
643 ****************************************************************************/ 642 ****************************************************************************/
644 643
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...", 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", 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, "\ninit_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 644/* init_book_archive() - if not called before, initialise the info list
714 * This reads in the bookarch file into memory. bookarch is the file 645 * This reads in the bookarch file into memory. bookarch is the file
715 * created and updated across multiple runs of the program. 646 * created and updated across multiple runs of the program.
716 */ 647 */
717
718static void 648static void
719init_book_archive (void) 649init_book_archive (void)
720{ 650{
721 FILE *fp; 651 FILE *fp;
722 int comp, nroftitle = 0; 652 int comp, nroftitle = 0;
… …
788 book->next = bl->first_book; 718 book->next = bl->first_book;
789 bl->first_book = book; 719 bl->first_book = book;
790 bl->number++; 720 bl->number++;
791 } 721 }
792 } 722 }
793 LOG (llevDebug, " book archives(used/avail): "); 723 LOG (llevDebug, "book archives(used/avail): \n");
794 for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++) 724 for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++)
795 { 725 {
796 LOG (llevDebug, "(%d/%d)", bl->number, max_titles[i]); 726 LOG (llevDebug, " (%d/%d)\n", bl->number, max_titles[i]);
797 } 727 }
798 LOG (llevDebug, "\n");
799 close_and_delete (fp, comp); 728 close_and_delete (fp, comp);
800 } 729 }
801 730
802#ifdef BOOK_MSG_DEBUG 731#ifdef BOOK_MSG_DEBUG
803 LOG (llevDebug, "\n init_book_archive() got %d titles.\n", nroftitle); 732 LOG (llevDebug, "init_book_archive() got %d titles.\n", nroftitle);
804#endif 733#endif
805 LOG (llevDebug, " done.\n"); 734 LOG (llevDebug, " done.\n");
806} 735}
807 736
808/* init_mon_info() - creates the linked list of pointers to 737/* init_mon_info() - creates the linked list of pointers to
… …
815 archetype *at; 744 archetype *at;
816 static int did_init_mon_info = 0; 745 static int did_init_mon_info = 0;
817 746
818 if (did_init_mon_info) 747 if (did_init_mon_info)
819 return; 748 return;
749
820 did_init_mon_info = 1; 750 did_init_mon_info = 1;
821 751
822 752 for_all_archetypes (at)
823 for (at = first_archetype; at != NULL; at = at->next)
824 { 753 {
825 if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE))) 754 if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE)))
826 { 755 {
827 objectlink *mon = (objectlink *) malloc (sizeof (objectlink)); 756 objectlink *mon = new objectlink;
828 757
829 mon->ob = &at->clone; 758 mon->ob = at;
830 mon->id = nrofmon;
831 mon->next = first_mon_info; 759 mon->next = first_mon_info;
832 first_mon_info = mon; 760 first_mon_info = mon;
833 nrofmon++; 761 nrofmon++;
834 } 762 }
835 } 763 }
764
836 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 765 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
837} 766}
838 767
839
840/* init_readable() - initialize linked lists utilized by 768/* init_readable() - initialise linked lists utilized by
841 * message functions in tailor_readable_ob() 769 * message functions in tailor_readable_ob()
842 * 770 *
843 * This is the function called by the main routine to initialize 771 * This is the function called by the main routine to initialise
844 * all the readable information. 772 * all the readable information.
845 */ 773 */
846
847void 774void
848init_readable (void) 775init_readable (void)
849{ 776{
850 static int did_this; 777 static int did_this;
851 778
852 if (did_this) 779 if (did_this)
853 return; 780 return;
781
854 did_this = 1; 782 did_this = 1;
855 783
856 LOG (llevDebug, "Initializing reading data..."); 784 LOG (llevDebug, "Initialising reading data...\n");
857 init_msgfile ();
858 init_book_archive (); 785 init_book_archive ();
859 init_mon_info (); 786 init_mon_info ();
860 LOG (llevDebug, " Done\n"); 787 LOG (llevDebug, " Done\n");
861
862} 788}
863 789
864/***************************************************************************** 790/*****************************************************************************
865 * 791 *
866 * This is the start of the administrative functions when creating 792 * This is the start of the administrative functions when creating
867 * new books (ie, updating title and the like) 793 * new books (ie, updating title and the like)
868 * 794 *
869 *****************************************************************************/ 795 *****************************************************************************/
870 796
871
872/* find_title() - Search the titlelist (based on msgtype) to see if 797/* find_title() - Search the titlelist (based on msgtype) to see if
873 * book matches something already there. IF so, return that title. 798 * book matches something already there. IF so, return that title.
874 */ 799 */
875
876static title * 800static title *
877find_title (const object *book, int msgtype) 801find_title (const object *book, int msgtype)
878{ 802{
879 title *t = NULL; 803 title *t = NULL;
880 titlelist *tl = get_titlelist (msgtype); 804 titlelist *tl = get_titlelist (msgtype);
… …
917 if (book->type != BOOK) 841 if (book->type != BOOK)
918 return; 842 return;
919 843
920 switch (msgtype) 844 switch (msgtype)
921 { 845 {
922 case 1: /*monster */ 846 case 1: /*monster */
923 nbr = sizeof (mon_book_name) / sizeof (char *); 847 nbr = sizeof (mon_book_name) / sizeof (char *);
924 strcpy (name, mon_book_name[RANDOM () % nbr]); 848 assign (name, mon_book_name[rndm (nbr)]);
925 break; 849 break;
926 case 2: /*artifact */ 850 case 2: /*artifact */
927 nbr = sizeof (art_book_name) / sizeof (char *); 851 nbr = sizeof (art_book_name) / sizeof (char *);
928 strcpy (name, art_book_name[RANDOM () % nbr]); 852 assign (name, art_book_name[rndm (nbr)]);
929 break; 853 break;
930 case 3: /*spellpath */ 854 case 3: /*spellpath */
931 nbr = sizeof (path_book_name) / sizeof (char *); 855 nbr = sizeof (path_book_name) / sizeof (char *);
932 strcpy (name, path_book_name[RANDOM () % nbr]); 856 assign (name, path_book_name[rndm (nbr)]);
933 break; 857 break;
934 case 4: /*alchemy */ 858 case 4: /*alchemy */
935 nbr = sizeof (formula_book_name) / sizeof (char *); 859 nbr = sizeof (formula_book_name) / sizeof (char *);
936 strcpy (name, formula_book_name[RANDOM () % nbr]); 860 assign (name, formula_book_name[rndm (nbr)]);
937 break; 861 break;
938 case 5: /*gods */ 862 case 5: /*gods */
939 nbr = sizeof (gods_book_name) / sizeof (char *); 863 nbr = sizeof (gods_book_name) / sizeof (char *);
940 strcpy (name, gods_book_name[RANDOM () % nbr]); 864 assign (name, gods_book_name[rndm (nbr)]);
941 break; 865 break;
942 case 6: /*msg file */ 866 case 6: /*msg file */
943 default: 867 default:
944 if (book->weight > 2000) 868 if (book->weight > 2000)
945 { /* based on weight */ 869 { /* based on weight */
946 nbr = sizeof (heavy_book_name) / sizeof (char *); 870 nbr = sizeof (heavy_book_name) / sizeof (char *);
947 strcpy (name, heavy_book_name[RANDOM () % nbr]); 871 assign (name, heavy_book_name[rndm (nbr)]);
948 } 872 }
949 else if (book->weight < 2001) 873 else if (book->weight < 2001)
950 { 874 {
951 nbr = sizeof (light_book_name) / sizeof (char *); 875 nbr = sizeof (light_book_name) / sizeof (char *);
952 strcpy (name, light_book_name[RANDOM () % nbr]); 876 assign (name, light_book_name[rndm (nbr)]);
953 } 877 }
954 break; 878 break;
955 } 879 }
956 880
957 book->name = name; 881 book->name = name;
958} 882}
959 883
… …
971 if (msgtype < 0 || strlen (op->msg) < 5) 895 if (msgtype < 0 || strlen (op->msg) < 5)
972 return; 896 return;
973 897
974 switch (msgtype) 898 switch (msgtype)
975 { 899 {
976 case 1: /* monster */ 900 case 1: /* monster */
977 nbr = sizeof (mon_author) / sizeof (char *); 901 nbr = sizeof (mon_author) / sizeof (char *);
978 strcpy (name, mon_author[RANDOM () % nbr]); 902 assign (name, mon_author[rndm (nbr)]);
979 break; 903 break;
980 case 2: /* artifacts */ 904 case 2: /* artifacts */
981 nbr = sizeof (art_author) / sizeof (char *); 905 nbr = sizeof (art_author) / sizeof (char *);
982 strcpy (name, art_author[RANDOM () % nbr]); 906 assign (name, art_author[rndm (nbr)]);
983 break; 907 break;
984 case 3: /* spellpath */ 908 case 3: /* spellpath */
985 nbr = sizeof (path_author) / sizeof (char *); 909 nbr = sizeof (path_author) / sizeof (char *);
986 strcpy (name, path_author[RANDOM () % nbr]); 910 assign (name, path_author[rndm (nbr)]);
987 break; 911 break;
988 case 4: /* alchemy */ 912 case 4: /* alchemy */
989 nbr = sizeof (formula_author) / sizeof (char *); 913 nbr = sizeof (formula_author) / sizeof (char *);
990 strcpy (name, formula_author[RANDOM () % nbr]); 914 assign (name, formula_author[rndm (nbr)]);
991 break; 915 break;
992 case 5: /* gods */ 916 case 5: /* gods */
993 nbr = sizeof (gods_author) / sizeof (char *); 917 nbr = sizeof (gods_author) / sizeof (char *);
994 strcpy (name, gods_author[RANDOM () % nbr]); 918 assign (name, gods_author[rndm (nbr)]);
995 break; 919 break;
996 case 6: /* msg file */ 920 case 6: /* msg file */
997 default: 921 default:
998 strcpy (name, book_author[RANDOM () % nbr]); 922 assign (name, book_author[rndm (nbr)]);
999 } 923 }
1000 924
1001 sprintf (title, "of %s", name); 925 sprintf (title, "of %s", name);
1002 op->title = title; 926 op->title = title;
1003} 927}
… …
1008 */ 932 */
1009 933
1010static int 934static int
1011unique_book (const object *book, int msgtype) 935unique_book (const object *book, int msgtype)
1012{ 936{
1013 title *test;
1014
1015 if (!booklist) 937 if (!booklist)
1016 return 1; /* No archival entries! Must be unique! */ 938 return 1; /* No archival entries! Must be unique! */
1017 939
1018 /* Go through the booklist. If the author and name match, not unique so 940 /* Go through the booklist. If the author and name match, not unique so
1019 * return 0. 941 * return 0.
1020 */ 942 */
1021 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 943 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
1022 {
1023 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 944 if (test->name == book->name && book->title == test->authour)
1024 return 0; 945 return 0;
1025 } 946
1026 return 1; 947 return 1;
1027} 948}
1028 949
1029/* add_book_to_list() */ 950/* add_book_to_list() */
1030 951
… …
1043 t = get_empty_book (); 964 t = get_empty_book ();
1044 t->name = book->name; 965 t->name = book->name;
1045 t->authour = book->title; 966 t->authour = book->title;
1046 t->size = strlen (book->msg); 967 t->size = strlen (book->msg);
1047 t->msg_index = strtoint (book->msg); 968 t->msg_index = strtoint (book->msg);
1048 t->archname = book->arch->name; 969 t->archname = book->arch->archname;
1049 t->level = book->level; 970 t->level = book->level;
1050 971
1051 t->next = tl->first_book; 972 t->next = tl->first_book;
1052 tl->first_book = t; 973 tl->first_book = t;
1053 tl->number++; 974 tl->number++;
… …
1077{ 998{
1078 int nbr = sizeof (book_descrpt) / sizeof (char *); 999 int nbr = sizeof (book_descrpt) / sizeof (char *);
1079 1000
1080 switch (book->type) 1001 switch (book->type)
1081 { 1002 {
1082 case BOOK: 1003 case BOOK:
1083 { 1004 {
1084 titlelist *tl = get_titlelist (msgtype); 1005 titlelist *tl = get_titlelist (msgtype);
1085 title *t = NULL; 1006 title *t = NULL;
1086 int tries = 0; 1007 int tries = 0;
1087 1008
1088 /* look to see if our msg already been archived. If so, alter 1009 /* look to see if our msg already been archived. If so, alter
1089 * the book to match the archival text. If we fail to match, 1010 * the book to match the archival text. If we fail to match,
1090 * then we archive the new title/name/msg combo if there is 1011 * then we archive the new title/name/msg combo if there is
1091 * room on the titlelist. 1012 * room on the titlelist.
1092 */ 1013 */
1093 1014
1094 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1015 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1095 { 1016 {
1096 object *tmpbook;
1097
1098 /* alter book properties */ 1017 /* alter book properties */
1099 if ((tmpbook = get_archetype (t->archname)) != NULL) 1018 if (object *tmpbook = get_archetype (t->archname))
1019 {
1020 tmpbook->msg = book->msg;
1021 tmpbook->copy_to (book);
1022 tmpbook->destroy ();
1023 }
1024
1025 book->title = t->authour;
1026 book->name = t->name;
1027 book->level = t->level;
1028 }
1029 /* Don't have any default title, so lets make up a new one */
1030 else
1031 {
1032 int numb, maxnames = max_titles[msgtype];
1033 const char *old_title;
1034 const char *old_name;
1035
1036 old_title = book->title;
1037 old_name = book->name;
1038
1039 /* some pre-generated books have title already set (from
1040 * maps), also don't bother looking for unique title if
1041 * we already used up all the available names! */
1042
1043 if (!tl)
1044 {
1045 LOG (llevError, "change_book_name(): can't find title list\n");
1046 numb = 0;
1047 }
1048 else
1049 numb = tl->number;
1050
1051 if (numb == maxnames)
1052 {
1053#ifdef ARCHIVE_DEBUG
1054 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1055#endif
1056 break;
1057 }
1058 /* shouldnt change map-maker books */
1059 else if (!book->title)
1060 do
1100 { 1061 {
1101 tmpbook->msg = book->msg; 1062 /* random book name */
1102 copy_object (tmpbook, book); 1063 new_text_name (book, msgtype);
1103 free_object (tmpbook); 1064 add_author (book, msgtype); /* random author */
1065 tries++;
1104 } 1066 }
1067 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1105 1068
1106 book->title = t->authour; 1069 /* Now deal with 2 cases.
1107 book->name = t->name; 1070 * 1)If no space for a new title exists lets just restore
1108 book->level = t->level; 1071 * the old book properties. Remember, if the book had
1072 * matchd an older entry on the titlelist, we shouldnt
1073 * have called this routine in the first place!
1074 * 2) If we got a unique title, we need to add it to
1075 * the list.
1109 } 1076 */
1110 /* Don't have any default title, so lets make up a new one */
1111 else
1112 {
1113 int numb, maxnames = max_titles[msgtype];
1114 const char *old_title;
1115 const char *old_name;
1116 1077
1117 old_title = book->title; 1078 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1118 old_name = book->name; 1079 { /* got to check maxnames again */
1119
1120 /* some pre-generated books have title already set (from
1121 * maps), also don't bother looking for unique title if
1122 * we already used up all the available names! */
1123
1124 if (!tl)
1125 {
1126 LOG (llevError, "change_book_name(): can't find title list\n");
1127 numb = 0;
1128 }
1129 else
1130 numb = tl->number;
1131
1132 if (numb == maxnames)
1133 {
1134#ifdef ARCHIVE_DEBUG 1080#ifdef ARCHIVE_DEBUG
1135 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1081 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1136#endif 1082#endif
1137 break; 1083 /* restore old book properties here */
1138 } 1084 book->title = old_title;
1139 /* shouldnt change map-maker books */ 1085
1140 else if (!book->title) 1086 if (rndm (4))
1141 do
1142 { 1087 {
1143 /* random book name */ 1088 /* Lets give the book a description to individualize it some */
1144 new_text_name (book, msgtype); 1089 char new_name[MAX_BUF];
1145 add_author (book, msgtype); /* random author */ 1090
1146 tries++; 1091 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1092
1093 book->name = new_name;
1147 } 1094 }
1148 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1149
1150 /* Now deal with 2 cases.
1151 * 1)If no space for a new title exists lets just restore
1152 * the old book properties. Remember, if the book had
1153 * matchd an older entry on the titlelist, we shouldnt
1154 * have called this routine in the first place!
1155 * 2) If we got a unique title, we need to add it to
1156 * the list.
1157 */
1158
1159 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1160 { /* got to check maxnames again */
1161#ifdef ARCHIVE_DEBUG
1162 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1163#endif
1164 /* restore old book properties here */
1165 book->title = old_title;
1166
1167 if (RANDOM () % 4)
1168 {
1169 /* Lets give the book a description to individualize it some */
1170 char new_name[MAX_BUF];
1171
1172 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[RANDOM () % nbr], old_name);
1173
1174 book->name = new_name;
1175 }
1176 else 1095 else
1177 { 1096 {
1178 book->name = old_name; 1097 book->name = old_name;
1179 } 1098 }
1180 } 1099 }
1181 else if (book->title && strlen (book->msg) > 5) 1100 else if (book->title && strlen (book->msg) > 5)
1182 { /* archive if long msg texts */ 1101 { /* archive if long msg texts */
1183 add_book_to_list (book, msgtype); 1102 add_book_to_list (book, msgtype);
1184 } 1103 }
1185 } 1104 }
1186 break; 1105 break;
1187 } 1106 }
1188 1107
1189 default: 1108 default:
1190 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1109 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1191 return; 1110 return;
1192 } 1111 }
1193} 1112}
1194 1113
1195/***************************************************************************** 1114/*****************************************************************************
1196 * 1115 *
… …
1221 return (object *) NULL; 1140 return (object *) NULL;
1222 1141
1223 if (!level) 1142 if (!level)
1224 { 1143 {
1225 /* lets get a random monster from the mon_info linked list */ 1144 /* lets get a random monster from the mon_info linked list */
1226 monnr = RANDOM () % nrofmon; 1145 monnr = rndm (nrofmon);
1227 1146
1228 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1147 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1229 if (i++ == monnr) 1148 if (i++ == monnr)
1230 break; 1149 break;
1231 1150
… …
1258 { 1177 {
1259 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level); 1178 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
1260 return NULL; 1179 return NULL;
1261 } 1180 }
1262 1181
1263 monnr = RANDOM () % i; 1182 monnr = rndm (i);
1264 for (mon = first_mon_info; mon; mon = mon->next) 1183 for (mon = first_mon_info; mon; mon = mon->next)
1265 if (mon->ob->level >= level && monnr-- == 0) 1184 if (mon->ob->level >= level && monnr-- == 0)
1266 return mon->ob; 1185 return mon->ob;
1267 1186
1268 if (!mon) 1187 if (!mon)
… …
1366 ****************************************************************************/ 1285 ****************************************************************************/
1367 1286
1368/* artifact_msg() - generate a message detailing the properties 1287/* artifact_msg() - generate a message detailing the properties
1369 * of 1-6 artifacts drawn sequentially from the artifact list. 1288 * of 1-6 artifacts drawn sequentially from the artifact list.
1370 */ 1289 */
1371 1290const char *
1372char *
1373artifact_msg (int level, int booksize) 1291artifact_msg (int level, int booksize)
1374{ 1292{
1375 artifactlist *al = NULL; 1293 artifactlist *al = NULL;
1376 artifact *art; 1294 artifact *art;
1377 int chance, i, type, index; 1295 int chance, i, type, index;
1378 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1296 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1297 const char *ch;
1379 char *ch, name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1298 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1380 static char retbuf[BOOK_BUF]; 1299 static char retbuf[BOOK_BUF];
1381 object *tmp = NULL; 1300 object *tmp = NULL;
1382 1301
1383 /* values greater than 5 create msg buffers that are too big! */ 1302 /* values greater than 5 create msg buffers that are too big! */
1384 if (book_entries > 5) 1303 if (book_entries > 5)
… …
1390 * for that type exists! 1309 * for that type exists!
1391 */ 1310 */
1392 i = 0; 1311 i = 0;
1393 do 1312 do
1394 { 1313 {
1395 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1314 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1396 type = art_name_array[index].type; 1315 type = art_name_array[index].type;
1397 al = find_artifactlist (type); 1316 al = find_artifactlist (type);
1398 i++; 1317 i++;
1399 } 1318 }
1400 while ((al == NULL) && (i < 10)); 1319 while ((al == NULL) && (i < 10));
1401 1320
1402 if (i == 10) /* Unable to find a message */ 1321 if (i == 10) /* Unable to find a message */
1403 return ("None"); 1322 return "None";
1404 1323
1405 /* There is no reason to start on the artifact list at the begining. Lets 1324 /* There is no reason to start on the artifact list at the begining. Lets
1406 * take our starting position randomly... */ 1325 * take our starting position randomly... */
1407 art = al->items; 1326 art = al->items;
1408 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1327 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1409 { 1328 {
1410 if (art == NULL) 1329 if (!art)
1411 art = al->items; /* hmm, out of stuff, loop back around */ 1330 art = al->items; /* hmm, out of stuff, loop back around */
1331
1412 art = art->next; 1332 art = art->next;
1413 } 1333 }
1414 1334
1415 /* the base 'generic' name for our artifact */ 1335 /* the base 'generic' name for our artifact */
1416 strcpy (name, art_name_array[index].name); 1336 assign (name, art_name_array[index].name);
1417 1337
1418 /* Ok, lets print out the contents */ 1338 /* Ok, lets print out the contents */
1419 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1339 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact");
1420 1340
1421 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1341 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
… …
1429 1349
1430 /* separator of items */ 1350 /* separator of items */
1431 strcpy (buf, "--- \n"); 1351 strcpy (buf, "--- \n");
1432 1352
1433 /* Name */ 1353 /* Name */
1434 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1354 if (art->allowed && art->allowed->name != shstr_All)
1435 { 1355 {
1436 linked_char *temp, *next = art->allowed; 1356 linked_char *temp, *next = art->allowed;
1437 1357
1438 do 1358 do
1439 { 1359 {
1440 temp = next; 1360 temp = next;
1441 next = next->next; 1361 next = next->next;
1442 } 1362 }
1443 while (next && !RANDOM () % 2); 1363 while (next && rndm (2));
1444 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1364 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name);
1445 } 1365 }
1446 else /* default name is used */ 1366 else /* default name is used */
1447 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1367 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name);
1448 1368
… …
1461 /* value of artifact */ 1381 /* value of artifact */
1462 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1382 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value);
1463 1383
1464 /* include the message about the artifact, if exists, and book 1384 /* include the message about the artifact, if exists, and book
1465 * level is kinda high */ 1385 * level is kinda high */
1466 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1386 if (art->item->msg
1387 && rndm (4) + 1 < level
1388 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
1467 strcat (buf, art->item->msg); 1389 strcat (buf, art->item->msg);
1468 1390
1469 /* properties of the artifact */ 1391 /* properties of the artifact */
1470 tmp = get_object (); 1392 tmp = object::create ();
1471 add_abilities (tmp, art->item); 1393 add_abilities (tmp, art->item);
1472 tmp->type = type; 1394 tmp->type = type;
1473 SET_FLAG (tmp, FLAG_IDENTIFIED); 1395 SET_FLAG (tmp, FLAG_IDENTIFIED);
1474 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1396 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1)
1475 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1397 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch);
1476 free_object (tmp); 1398 tmp->destroy ();
1477 /* add the buf if it will fit */ 1399 /* add the buf if it will fit */
1478 if (!book_overflow (retbuf, buf, booksize)) 1400 if (!book_overflow (retbuf, buf, booksize))
1479 strcat (retbuf, buf); 1401 strcat (retbuf, buf);
1480 else 1402 else
1481 break; 1403 break;
… …
1503char * 1425char *
1504spellpath_msg (int level, int booksize) 1426spellpath_msg (int level, int booksize)
1505{ 1427{
1506 static char retbuf[BOOK_BUF]; 1428 static char retbuf[BOOK_BUF];
1507 char tmpbuf[BOOK_BUF]; 1429 char tmpbuf[BOOK_BUF];
1508 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1430 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1509 int did_first_sp = 0; 1431 int did_first_sp = 0;
1510 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1432 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1511 archetype *at; 1433 archetype *at;
1512 1434
1513 /* Preamble */ 1435 /* Preamble */
… …
1516 if (path == -1) 1438 if (path == -1)
1517 strcat (retbuf, "having no known spell path.\n"); 1439 strcat (retbuf, "having no known spell path.\n");
1518 else 1440 else
1519 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1441 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]);
1520 1442
1521 for (at = first_archetype; at != NULL; at = at->next) 1443 for_all_archetypes (at)
1522 { 1444 {
1523 /* Determine if this is an appropriate spell. Must 1445 /* Determine if this is an appropriate spell. Must
1524 * be of matching path, must be of appropriate type (prayer 1446 * be of matching path, must be of appropriate type (prayer
1525 * or not), and must be within the valid level range. 1447 * or not), and must be within the valid level range.
1526 */ 1448 */
1527 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1449 if (at->type == SPELL && at->path_attuned & pnum &&
1528 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8))) 1450 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1529 { 1451 {
1530 strcpy (tmpbuf, at->clone.name); 1452 assign (tmpbuf, at->object::name);
1531 1453
1532 if (book_overflow (retbuf, tmpbuf, booksize)) 1454 if (book_overflow (retbuf, tmpbuf, booksize))
1533 break; 1455 break;
1534 else 1456 else
1535 { 1457 {
… …
1541 } 1463 }
1542 } 1464 }
1543 /* Geez, no spells were generated. */ 1465 /* Geez, no spells were generated. */
1544 if (!did_first_sp) 1466 if (!did_first_sp)
1545 { 1467 {
1546 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1468 if (rndm (4)) /* usually, lets make a recursive call... */
1547 spellpath_msg (level, booksize); 1469 spellpath_msg (level, booksize);
1548 else /* give up, cause knowing no spells exist for path is info too. */ 1470 else /* give up, cause knowing no spells exist for path is info too. */
1549 strcat (retbuf, "\n - no known spells exist -\n"); 1471 strcat (retbuf, "\n - no known spells exist -\n");
1550 } 1472 }
1551 else 1473 else
… …
1553 strcat (retbuf, "\n"); 1475 strcat (retbuf, "\n");
1554 } 1476 }
1555 return retbuf; 1477 return retbuf;
1556} 1478}
1557 1479
1558
1559
1560/* formula_msg() - generate a message detailing the properties 1480/* formula_msg() - generate a message detailing the properties
1561 * of a randomly selected alchemical formula. 1481 * of a randomly selected alchemical formula.
1562 */ 1482 */
1563
1564void 1483void
1565make_formula_book (object *book, int level) 1484make_formula_book (object *book, int level)
1566{ 1485{
1567 char retbuf[BOOK_BUF], title[MAX_BUF]; 1486 char retbuf[BOOK_BUF], title[MAX_BUF];
1568 recipelist *fl; 1487 recipelist *fl;
… …
1570 int chance; 1489 int chance;
1571 1490
1572 /* the higher the book level, the more complex (ie number of 1491 /* the higher the book level, the more complex (ie number of
1573 * ingredients) the formula can be. 1492 * ingredients) the formula can be.
1574 */ 1493 */
1575 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1494 fl = get_formulalist (rndm (level) / 3 + 1);
1576 1495
1577 if (!fl) 1496 if (!fl)
1578 fl = get_formulalist (1); /* safety */ 1497 fl = get_formulalist (1); /* safety */
1579 1498
1580 if (fl->total_chance == 0) 1499 if (fl->total_chance == 0)
… …
1584 add_author (book, 4); 1503 add_author (book, 4);
1585 return; 1504 return;
1586 } 1505 }
1587 1506
1588 /* get a random formula, weighted by its bookchance */ 1507 /* get a random formula, weighted by its bookchance */
1589 chance = RANDOM () % fl->total_chance; 1508 chance = rndm (fl->total_chance);
1590 for (formula = fl->items; formula != NULL; formula = formula->next) 1509 for (formula = fl->items; formula; formula = formula->next)
1591 { 1510 {
1592 chance -= formula->chance; 1511 chance -= formula->chance;
1593 if (chance <= 0) 1512 if (chance <= 0)
1594 break; 1513 break;
1595 } 1514 }
… …
1605 { 1524 {
1606 /* looks like a formula was found. Base the amount 1525 /* looks like a formula was found. Base the amount
1607 * of information on the booklevel and the spellevel 1526 * of information on the booklevel and the spellevel
1608 * of the formula. */ 1527 * of the formula. */
1609 1528
1610 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1529 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1611 archetype *at; 1530 archetype *at;
1612 1531
1613 /* preamble */ 1532 /* preamble */
1614 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1533 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1615 1534
1616 if ((at = archetype::find (op_name)) != (archetype *) NULL) 1535 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1617 op_name = at->clone.name; 1536 op_name = at->object::name;
1618 else 1537 else
1619 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1538 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1620 1539
1621 /* item name */ 1540 /* item name */
1622 if (strcmp (formula->title, "NONE")) 1541 if (formula->title != shstr_NONE)
1623 { 1542 {
1624 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title); 1543 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1625 /* This results in things like pile of philo. sulfur. 1544 /* This results in things like pile of philo. sulfur.
1626 * while philo. sulfur may look better, without this, 1545 * while philo. sulfur may look better, without this,
1627 * you get things like 'the wise' because its missing the 1546 * you get things like 'the wise' because its missing the
1628 * water of section. 1547 * water of section.
1629 */ 1548 */
1630 sprintf (title, "%s: %s of %s", 1549 sprintf (title, "%s: %s of %s",
1631 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title); 1550 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1632 } 1551 }
1633 else 1552 else
1634 { 1553 {
1635 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1554 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1636 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1555 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1637 if (at->clone.title) 1556 if (at->title)
1638 { 1557 {
1639 strcat (retbuf, " "); 1558 strcat (retbuf, " ");
1640 strcat (retbuf, at->clone.title); 1559 strcat (retbuf, at->title);
1641 strcat (title, " "); 1560 strcat (title, " ");
1642 strcat (title, at->clone.title); 1561 strcat (title, at->title);
1643 } 1562 }
1644 } 1563 }
1564
1645 /* Lets name the book something meaningful ! */ 1565 /* Lets name the book something meaningful ! */
1646 book->name = title; 1566 book->name = title;
1647 book->title = NULL; 1567 book->title = NULL;
1648 1568
1649 /* ingredients to make it */ 1569 /* ingredients to make it */
… …
1653 archetype *at; 1573 archetype *at;
1654 1574
1655 at = archetype::find (formula->cauldron); 1575 at = archetype::find (formula->cauldron);
1656 1576
1657 sprintf (retbuf + strlen (retbuf), 1577 sprintf (retbuf + strlen (retbuf),
1658 " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place"); 1578 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place");
1659 1579
1660 for (next = formula->ingred; next != NULL; next = next->next) 1580 for (next = formula->ingred; next != NULL; next = next->next)
1661 { 1581 {
1662 strcat (retbuf, next->name); 1582 strcat (retbuf, next->name);
1663 strcat (retbuf, "\n"); 1583 strcat (retbuf, "\n");
… …
1670 1590
1671 book->msg = retbuf; 1591 book->msg = retbuf;
1672 } 1592 }
1673} 1593}
1674 1594
1675 1595#define DESCRIBE_PATH(retbuf, variable, name) \
1676/* msgfile_msg() - generate a message drawn randomly from a 1596 if(variable) { \
1677 * file in lib/. Level currently has no effect on the message 1597 int i,j=0; \
1678 * which is returned. 1598 strcat(retbuf,"(" name ": "); \
1679 */ 1599 for(i=0; i<NRSPELLPATHS; i++) \
1680 1600 if(variable & (1<<i)) { \
1681char * 1601 if (j) \
1682msgfile_msg (int level, int booksize) 1602 strcat(retbuf,", "); \
1683{ 1603 else \
1684 static char retbuf[BOOK_BUF]; 1604 j = 1; \
1685 int i, msgnum; 1605 strcat(retbuf, spellpathnames[i]); \
1686 linked_char *msg = NULL; 1606 } \
1687 1607 strcat(retbuf,")"); \
1688 /* get a random message for the 'book' from linked list */
1689 if (nrofmsg > 1)
1690 { 1608 }
1691 msg = first_msg;
1692 msgnum = RANDOM () % nrofmsg;
1693 for (i = 0; msg && i < nrofmsg && i != msgnum; i++)
1694 msg = msg->next;
1695 }
1696
1697 if (msg && !book_overflow (retbuf, msg->name, booksize))
1698 strcpy (retbuf, msg->name);
1699 else
1700 sprintf (retbuf, "\n <undecipherable text>");
1701
1702#ifdef BOOK_MSG_DEBUG
1703 LOG (llevDebug, "\n info_list_msg() created strng: %d\n", strlen (retbuf));
1704 LOG (llevDebug, " MADE THIS:\n%s\n", retbuf);
1705#endif
1706
1707 return retbuf;
1708}
1709
1710 1609
1711/* god_info_msg() - generate a message detailing the properties 1610/* god_info_msg() - generate a message detailing the properties
1712 * of a random god. Used by the book hack. b.t. 1611 * of a random god. Used by the book hack. b.t.
1713 */ 1612 */
1714
1715const char * 1613const char *
1716god_info_msg (int level, int booksize) 1614god_info_msg (int level, int booksize)
1717{ 1615{
1718 static char retbuf[BOOK_BUF]; 1616 static char retbuf[BOOK_BUF];
1719 const char *name = NULL; 1617 const char *name = NULL;
… …
1744 1642
1745 /* Information about the god is random, and based on the level of the 1643 /* Information about the god is random, and based on the level of the
1746 * 'book'. Probably there is a more intellegent way to implement 1644 * 'book'. Probably there is a more intellegent way to implement
1747 * this ... 1645 * this ...
1748 */ 1646 */
1749
1750 while (level > 0) 1647 while (level > 0)
1751 { 1648 {
1752 sprintf (buf, " "); 1649 sprintf (buf, " ");
1753 if (level == 2 && RANDOM () % 2) 1650 if (level == 2 && rndm (2))
1754 { /* enemy god */ 1651 { /* enemy god */
1755 const char *enemy = god->title; 1652 const char *enemy = god->title;
1756 1653
1757 if (enemy) 1654 if (enemy)
1758 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1655 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1759 } 1656 }
1657
1760 if (level == 3 && RANDOM () % 2) 1658 if (level == 3 && rndm (2))
1761 { /* enemy race, what the god's holy word effects */ 1659 { /* enemy race, what the god's holy word effects */
1762 const char *enemy = god->slaying; 1660 const char *enemy = god->slaying;
1763 1661
1764 if (enemy && !(god->path_denied & PATH_TURNING)) 1662 if (enemy && !(god->path_denied & PATH_TURNING))
1765 if ((i = nstrtok (enemy, ",")) > 0) 1663 if ((i = nstrtok (enemy, ",")) > 0)
… …
1773 else 1671 else
1774 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1672 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1775 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1673 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1776 } 1674 }
1777 } 1675 }
1676
1778 if (level == 4 && RANDOM () % 2) 1677 if (level == 4 && rndm (2))
1779 { /* Priest of god gets these protect,vulnerable... */ 1678 { /* Priest of god gets these protect,vulnerable... */
1780 char tmpbuf[MAX_BUF], *cp; 1679 char tmpbuf[MAX_BUF];
1781 1680
1782 cp = describe_resistance (god, 1); 1681 if (const char *cp = describe_resistance (god, 1))
1783
1784 if (*cp)
1785 { /* This god does have protections */ 1682 { /* This god does have protections */
1786 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1683 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name);
1787 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1684 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n");
1788 strcat (tmpbuf, cp); 1685 strcat (tmpbuf, cp);
1789 strcat (buf, tmpbuf); 1686 strcat (buf, tmpbuf);
1790 strcat (buf, "\n ---\n"); 1687 strcat (buf, "\n ---\n");
1791 } 1688 }
1792 else 1689 else
1793 sprintf (buf, " "); 1690 sprintf (buf, " ");
1794 } 1691 }
1692
1795 if (level == 5 && RANDOM () % 2) 1693 if (level == 5 && rndm (2))
1796 { /* aligned race, summoning */ 1694 { /* aligned race, summoning */
1797 const char *race = god->race; /* aligned race */ 1695 const char *race = god->race; /* aligned race */
1798 1696
1799 if (race && !(god->path_denied & PATH_SUMMON)) 1697 if (race && !(god->path_denied & PATH_SUMMON))
1800 if ((i = nstrtok (race, ",")) > 0) 1698 if ((i = nstrtok (race, ",")) > 0)
… …
1807 else 1705 else
1808 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1706 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1809 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1707 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1810 } 1708 }
1811 } 1709 }
1710
1812 if (level == 6 && RANDOM () % 2) 1711 if (level == 6 && rndm (2))
1813 { /* blessing,curse properties of the god */ 1712 { /* blessing,curse properties of the god */
1814 char tmpbuf[MAX_BUF], *cp; 1713 char tmpbuf[MAX_BUF];
1815 1714
1816 cp = describe_resistance (god, 1); 1715 if (const char *cp = describe_resistance (god, 1))
1817
1818 if (*cp)
1819 { /* This god does have protections */ 1716 { /* This god does have protections */
1820 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name); 1717 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name);
1821 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1718 strcat (tmpbuf, "bestow a blessing which makes the recipient\n");
1822 strcat (tmpbuf, cp); 1719 strcat (tmpbuf, cp);
1823 strcat (buf, tmpbuf); 1720 strcat (buf, tmpbuf);
… …
1825 } 1722 }
1826 else 1723 else
1827 sprintf (buf, " "); 1724 sprintf (buf, " ");
1828 1725
1829 } 1726 }
1727
1830 if (level == 8 && RANDOM () % 2) 1728 if (level == 8 && rndm (2))
1831 { /* immunity, holy possession */ 1729 { /* immunity, holy possession */
1832 int has_effect = 0, tmpvar; 1730 int has_effect = 0, tmpvar;
1833 char tmpbuf[MAX_BUF]; 1731 char tmpbuf[MAX_BUF];
1834 1732
1835 sprintf (tmpbuf, "\n"); 1733 sprintf (tmpbuf, "\n");
… …
1843 { 1741 {
1844 has_effect = 1; 1742 has_effect = 1;
1845 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]); 1743 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1846 } 1744 }
1847 } 1745 }
1746
1848 if (has_effect) 1747 if (has_effect)
1849 { 1748 {
1850 strcat (buf, tmpbuf); 1749 strcat (buf, tmpbuf);
1851 strcat (buf, "\n ---\n"); 1750 strcat (buf, "\n ---\n");
1852 } 1751 }
1853 else 1752 else
1854 sprintf (buf, " "); 1753 sprintf (buf, " ");
1855 } 1754 }
1755
1856 if (level == 12 && RANDOM () % 2) 1756 if (level == 12 && rndm (2))
1857 { /* spell paths */ 1757 { /* spell paths */
1858 int has_effect = 0, tmpvar; 1758 int has_effect = 0, tmpvar;
1859 char tmpbuf[MAX_BUF]; 1759 char tmpbuf[MAX_BUF];
1860 1760
1861 sprintf (tmpbuf, "\n"); 1761 sprintf (tmpbuf, "\n");
1862 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1762 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
1863 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n"); 1763 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n");
1764
1864 if ((tmpvar = god->path_attuned)) 1765 if ((tmpvar = god->path_attuned))
1865 { 1766 {
1866 has_effect = 1; 1767 has_effect = 1;
1867 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned"); 1768 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned");
1868 } 1769 }
1770
1869 if ((tmpvar = god->path_repelled)) 1771 if ((tmpvar = god->path_repelled))
1870 { 1772 {
1871 has_effect = 1; 1773 has_effect = 1;
1872 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled"); 1774 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled");
1873 } 1775 }
1776
1874 if ((tmpvar = god->path_denied)) 1777 if ((tmpvar = god->path_denied))
1875 { 1778 {
1876 has_effect = 1; 1779 has_effect = 1;
1877 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1780 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1878 } 1781 }
1782
1879 if (has_effect) 1783 if (has_effect)
1880 { 1784 {
1881 strcat (buf, tmpbuf); 1785 strcat (buf, tmpbuf);
1882 strcat (buf, "\n ---\n"); 1786 strcat (buf, "\n ---\n");
1883 } 1787 }
… …
1891 */ 1795 */
1892 if (book_overflow (retbuf, buf, booksize)) 1796 if (book_overflow (retbuf, buf, booksize))
1893 break; 1797 break;
1894 else if (strlen (buf) > 1) 1798 else if (strlen (buf) > 1)
1895 strcat (retbuf, buf); 1799 strcat (retbuf, buf);
1800
1896 level--; 1801 level--;
1897 } 1802 }
1803
1898 if (strlen (retbuf) == introlen) 1804 if (strlen (retbuf) == introlen)
1899 { /* we got no information beyond the preamble! */ 1805 { /* we got no information beyond the preamble! */
1900 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1806 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1901 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1807 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1902 } 1808 }
… …
1921 * book is the object we are creating into. 1827 * book is the object we are creating into.
1922 * If msg_type is a positive value, we use that to determine the 1828 * If msg_type is a positive value, we use that to determine the
1923 * message type - otherwise a random value is used. 1829 * message type - otherwise a random value is used.
1924 * 1830 *
1925 */ 1831 */
1926
1927void 1832void
1928tailor_readable_ob (object *book, int msg_type) 1833tailor_readable_ob (object *book, int msg_type)
1929{ 1834{
1930 char msgbuf[BOOK_BUF]; 1835 char msgbuf[BOOK_BUF];
1931 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1836 int level = book->level ? rndm (book->level) + 1 : 1;
1932 int book_buf_size; 1837 int book_buf_size;
1933 1838
1934 /* safety */ 1839 /* safety */
1935 if (book->type != BOOK) 1840 if (book->type != BOOK)
1936 return; 1841 return;
… …
1950 * 2) make sure there is an entry in max_titles[] array. 1855 * 2) make sure there is an entry in max_titles[] array.
1951 * 3) make sure there are entries for your case in new_text_title() 1856 * 3) make sure there are entries for your case in new_text_title()
1952 * and add_authour(). 1857 * and add_authour().
1953 * 4) you may want separate authour/book name arrays in read.h 1858 * 4) you may want separate authour/book name arrays in read.h
1954 */ 1859 */
1955
1956 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1860 msg_type = msg_type > 0 ? msg_type : rndm (8);
1957 switch (msg_type) 1861 switch (msg_type)
1958 { 1862 {
1959 case 1: /* monster attrib */ 1863 case 1: /* monster attrib */
1960 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1864 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1961 break; 1865 break;
1962 case 2: /* artifact attrib */ 1866 case 2: /* artifact attrib */
1963 strcpy (msgbuf, artifact_msg (level, book_buf_size)); 1867 strcpy (msgbuf, artifact_msg (level, book_buf_size));
1964 break; 1868 break;
1965 case 3: /* grouping incantations/prayers by path */ 1869 case 3: /* grouping incantations/prayers by path */
1966 strcpy (msgbuf, spellpath_msg (level, book_buf_size)); 1870 strcpy (msgbuf, spellpath_msg (level, book_buf_size));
1967 break; 1871 break;
1968 case 4: /* describe an alchemy formula */ 1872 case 4: /* describe an alchemy formula */
1969 make_formula_book (book, level); 1873 make_formula_book (book, level);
1970 /* make_formula_book already gives title */ 1874 /* make_formula_book already gives title */
1971 return; 1875 return;
1972 break; 1876 break;
1973 case 5: /* bits of information about a god */ 1877 case 5: /* bits of information about a god */
1974 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1878 strcpy (msgbuf, god_info_msg (level, book_buf_size));
1975 break; 1879 break;
1976 case 0: /* use info list in lib/ */ 1880 case 0: /* use info list in lib/ */
1977 default: 1881 default:
1978 strcpy (msgbuf, msgfile_msg (level, book_buf_size)); 1882 cfperl_make_book (book, level);
1979 break; 1883 return;
1980 } 1884 }
1981 1885
1982 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */ 1886 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1983 1887
1984 if (strlen (msgbuf) > 1) 1888 if (strlen (msgbuf) > 1)
1985 { 1889 {
1986 book->msg = msgbuf; 1890 book->msg = msgbuf;
1987 /* lets give the "book" a new name, which may be a compound word */ 1891 /* lets give the "book" a new name, which may be a compound word */
1988 change_book (book, msg_type); 1892 change_book (book, msg_type);
1989 } 1893 }
1990
1991} 1894}
1992 1895
1993 1896
1994/***************************************************************************** 1897/*****************************************************************************
1995 * 1898 *
… …
2027 } 1930 }
2028 1931
2029 for (monlink = first_mon_info; monlink; monlink = nextmon) 1932 for (monlink = first_mon_info; monlink; monlink = nextmon)
2030 { 1933 {
2031 nextmon = monlink->next; 1934 nextmon = monlink->next;
2032 free (monlink); 1935 delete monlink;
2033 } 1936 }
2034} 1937}
2035 1938
2036 1939
2037/***************************************************************************** 1940/*****************************************************************************
… …
2090get_readable_message_type (object *readable) 1993get_readable_message_type (object *readable)
2091{ 1994{
2092 uint8 subtype = readable->subtype; 1995 uint8 subtype = readable->subtype;
2093 1996
2094 if (subtype > last_readable_subtype) 1997 if (subtype > last_readable_subtype)
2095 return &(readable_message_types[0]); 1998 return &readable_message_types[0];
1999
2096 return &(readable_message_types[subtype]); 2000 return &readable_message_types[subtype];
2097} 2001}

Diff Legend

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