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

Diff Legend

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