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.25 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.48 by root, Thu Oct 15 23:25:53 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
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 */
… …
30 30
31#include <global.h> 31#include <global.h>
32#include <book.h> 32#include <book.h>
33#include <living.h> 33#include <living.h>
34#include <spells.h> 34#include <spells.h>
35
36 35
37/* Define this if you want to archive book titles by contents. 36/* Define this if you want to archive book titles by contents.
38 * This option should enforce UNIQUE combinations of titles,authors and 37 * This option should enforce UNIQUE combinations of titles,authors and
39 * msg contents during and *between* game sessions. 38 * msg contents during and *between* game sessions.
40 * Note: a slight degeneracy exists since books are archived based on an integer 39 * Note: a slight degeneracy exists since books are archived based on an integer
… …
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 *)),
… …
570 * (shstr.c ?), but the quantity BOOK_BUF will need to be defined. */ 569 * (shstr.c ?), but the quantity BOOK_BUF will need to be defined. */
571 570
572/* nstrtok() - simple routine to return the number of list 571/* nstrtok() - simple routine to return the number of list
573 * items in buf1 as separated by the value of buf2 572 * items in buf1 as separated by the value of buf2
574 */ 573 */
575 574static int
576int
577nstrtok (const char *buf1, const char *buf2) 575nstrtok (const char *buf1, const char *buf2)
578{ 576{
579 char *tbuf, sbuf[12], buf[MAX_BUF]; 577 char *tbuf, sbuf[12], buf[MAX_BUF];
580 int number = 0; 578 int number = 0;
581 579
… …
594 592
595/* strtoktolin() - takes a string in buf1 and separates it into 593/* strtoktolin() - takes a string in buf1 and separates it into
596 * a list of strings delimited by buf2. Then returns a comma 594 * a list of strings delimited by buf2. Then returns a comma
597 * separated string w/ decent punctuation. 595 * separated string w/ decent punctuation.
598 */ 596 */
599 597static char *
600char *
601strtoktolin (const char *buf1, const char *buf2) 598strtoktolin (const char *buf1, const char *buf2)
602{ 599{
603 int maxi, i = nstrtok (buf1, buf2); 600 int maxi, i = nstrtok (buf1, buf2);
604 char *tbuf, buf[MAX_BUF], sbuf[12]; 601 char *tbuf, buf[MAX_BUF], sbuf[12];
605 static char rbuf[BOOK_BUF]; 602 static char rbuf[BOOK_BUF];
… …
622 tbuf = strtok (NULL, sbuf); 619 tbuf = strtok (NULL, sbuf);
623 } 620 }
624 return (char *) rbuf; 621 return (char *) rbuf;
625} 622}
626 623
627int 624static int
628book_overflow (const char *buf1, const char *buf2, int booksize) 625book_overflow (const char *buf1, const char *buf2, int booksize)
629{ 626{
630
631 if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */ 627 if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */
632 || buf_overflow (buf1, buf2, booksize)) 628 || buf_overflow (buf1, buf2, booksize))
633 return 1; 629 return 1;
630
634 return 0; 631 return 0;
635
636
637} 632}
638 633
639/***************************************************************************** 634/*****************************************************************************
640 * 635 *
641 * Start of initialisation related functions. 636 * Start of initialisation related functions.
… …
748 if (did_init_mon_info) 743 if (did_init_mon_info)
749 return; 744 return;
750 745
751 did_init_mon_info = 1; 746 did_init_mon_info = 1;
752 747
753 748 for_all_archetypes (at)
754 for (at = first_archetype; at != NULL; at = at->next)
755 { 749 {
756 if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE))) 750 if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE)))
757 { 751 {
758 objectlink *mon = new objectlink; 752 objectlink *mon = new objectlink;
759 753
760 mon->ob = &at->clone; 754 mon->ob = at;
761 mon->next = first_mon_info; 755 mon->next = first_mon_info;
762 first_mon_info = mon; 756 first_mon_info = mon;
763 nrofmon++; 757 nrofmon++;
764 } 758 }
765 } 759 }
… …
819 else 813 else
820 t = t->next; 814 t = t->next;
821 815
822#ifdef ARCHIVE_DEBUG 816#ifdef ARCHIVE_DEBUG
823 if (t) 817 if (t)
824 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, t->name, t->authour, t->msg_index); 818 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, &t->name, &t->authour, t->msg_index);
825#endif 819#endif
826 820
827 return t; 821 return t;
828} 822}
829 823
… …
831 * handled directly in change_book_name(). Names are based on text 825 * handled directly in change_book_name(). Names are based on text
832 * msgtype 826 * msgtype
833 * this sets book book->name based on msgtype given. What name 827 * this sets book book->name based on msgtype given. What name
834 * is given is based on various criteria 828 * is given is based on various criteria
835 */ 829 */
836
837static void 830static void
838new_text_name (object *book, int msgtype) 831new_text_name (object *book, int msgtype)
839{ 832{
840 int nbr; 833 int nbr;
841 char name[MAX_BUF]; 834 char name[MAX_BUF];
… …
934 */ 927 */
935 928
936static int 929static int
937unique_book (const object *book, int msgtype) 930unique_book (const object *book, int msgtype)
938{ 931{
939 title *test;
940
941 if (!booklist) 932 if (!booklist)
942 return 1; /* No archival entries! Must be unique! */ 933 return 1; /* No archival entries! Must be unique! */
943 934
944 /* Go through the booklist. If the author and name match, not unique so 935 /* Go through the booklist. If the author and name match, not unique so
945 * return 0. 936 * return 0.
946 */ 937 */
947 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 938 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
948 {
949 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 939 if (test->name == book->name && book->title == test->authour)
950 return 0; 940 return 0;
951 } 941
952 return 1; 942 return 1;
953} 943}
954 944
955/* add_book_to_list() */ 945/* add_book_to_list() */
956 946
… …
969 t = get_empty_book (); 959 t = get_empty_book ();
970 t->name = book->name; 960 t->name = book->name;
971 t->authour = book->title; 961 t->authour = book->title;
972 t->size = strlen (book->msg); 962 t->size = strlen (book->msg);
973 t->msg_index = strtoint (book->msg); 963 t->msg_index = strtoint (book->msg);
974 t->archname = book->arch->name; 964 t->archname = book->arch->archname;
975 t->level = book->level; 965 t->level = book->level;
976 966
977 t->next = tl->first_book; 967 t->next = tl->first_book;
978 tl->first_book = t; 968 tl->first_book = t;
979 tl->number++; 969 tl->number++;
980 970
981 /* We have stuff we need to write now */ 971 /* We have stuff we need to write now */
982 need_to_write_bookarchive = 1; 972 need_to_write_bookarchive = 1;
983 973
984#ifdef ARCHIVE_DEBUG 974#ifdef ARCHIVE_DEBUG
985 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", book->name, book->title, msgtype); 975 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", &book->name, &book->title, msgtype);
986#endif 976#endif
987 977
988} 978}
989 979
990 980
… …
996 * levels and architypes. -b.t. 986 * levels and architypes. -b.t.
997 */ 987 */
998 988
999#define MAX_TITLE_CHECK 20 989#define MAX_TITLE_CHECK 20
1000 990
1001void 991static void
1002change_book (object *book, int msgtype) 992change_book (object *book, int msgtype)
1003{ 993{
1004 int nbr = sizeof (book_descrpt) / sizeof (char *); 994 int nbr = sizeof (book_descrpt) / sizeof (char *);
1005 995
1006 switch (book->type) 996 switch (book->type)
1007 { 997 {
1008 case BOOK: 998 case BOOK:
1009 { 999 {
1010 titlelist *tl = get_titlelist (msgtype); 1000 titlelist *tl = get_titlelist (msgtype);
1011 title *t = NULL; 1001 title *t = NULL;
1012 int tries = 0; 1002 int tries = 0;
1013 1003
1014 /* look to see if our msg already been archived. If so, alter 1004 /* look to see if our msg already been archived. If so, alter
1015 * the book to match the archival text. If we fail to match, 1005 * the book to match the archival text. If we fail to match,
1016 * then we archive the new title/name/msg combo if there is 1006 * then we archive the new title/name/msg combo if there is
1017 * room on the titlelist. 1007 * room on the titlelist.
1018 */ 1008 */
1019 1009
1020 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1010 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1021 { 1011 {
1022 object *tmpbook;
1023
1024 /* alter book properties */ 1012 /* alter book properties */
1025 if ((tmpbook = get_archetype (t->archname)) != NULL) 1013 if (object *tmpbook = get_archetype (t->archname))
1014 {
1015 tmpbook->msg = book->msg;
1016 tmpbook->copy_to (book);
1017 tmpbook->destroy ();
1018 }
1019
1020 book->title = t->authour;
1021 book->name = t->name;
1022 book->level = t->level;
1023 }
1024 /* Don't have any default title, so lets make up a new one */
1025 else
1026 {
1027 int numb, maxnames = max_titles[msgtype];
1028 const char *old_title;
1029 const char *old_name;
1030
1031 old_title = book->title;
1032 old_name = book->name;
1033
1034 /* some pre-generated books have title already set (from
1035 * maps), also don't bother looking for unique title if
1036 * we already used up all the available names! */
1037
1038 if (!tl)
1039 {
1040 LOG (llevError, "change_book_name(): can't find title list\n");
1041 numb = 0;
1042 }
1043 else
1044 numb = tl->number;
1045
1046 if (numb == maxnames)
1047 {
1048#ifdef ARCHIVE_DEBUG
1049 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1050#endif
1051 }
1052 /* shouldnt change map-maker books */
1053 else if (!book->title)
1054 do
1026 { 1055 {
1027 tmpbook->msg = book->msg; 1056 /* random book name */
1028 tmpbook->copy_to (book); 1057 new_text_name (book, msgtype);
1029 tmpbook->destroy (); 1058 add_author (book, msgtype); /* random author */
1059 tries++;
1030 } 1060 }
1061 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1031 1062
1032 book->title = t->authour; 1063 /* Now deal with 2 cases.
1033 book->name = t->name; 1064 * 1)If no space for a new title exists lets just restore
1034 book->level = t->level; 1065 * the old book properties. Remember, if the book had
1066 * matchd an older entry on the titlelist, we shouldnt
1067 * have called this routine in the first place!
1068 * 2) If we got a unique title, we need to add it to
1069 * the list.
1035 } 1070 */
1036 /* Don't have any default title, so lets make up a new one */
1037 else
1038 {
1039 int numb, maxnames = max_titles[msgtype];
1040 const char *old_title;
1041 const char *old_name;
1042 1071
1043 old_title = book->title; 1072 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1044 old_name = book->name; 1073 { /* got to check maxnames again */
1045
1046 /* some pre-generated books have title already set (from
1047 * maps), also don't bother looking for unique title if
1048 * we already used up all the available names! */
1049
1050 if (!tl)
1051 {
1052 LOG (llevError, "change_book_name(): can't find title list\n");
1053 numb = 0;
1054 }
1055 else
1056 numb = tl->number;
1057
1058 if (numb == maxnames)
1059 {
1060#ifdef ARCHIVE_DEBUG 1074#ifdef ARCHIVE_DEBUG
1061 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1075 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
1062#endif 1076#endif
1063 break; 1077 /* restore old book properties here */
1064 } 1078 book->title = old_title;
1065 /* shouldnt change map-maker books */ 1079
1066 else if (!book->title) 1080 if (rndm (4))
1067 do
1068 { 1081 {
1069 /* random book name */ 1082 /* Lets give the book a description to individualize it some */
1070 new_text_name (book, msgtype); 1083 char new_name[MAX_BUF];
1071 add_author (book, msgtype); /* random author */ 1084
1072 tries++; 1085 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1086
1087 book->name = new_name;
1073 } 1088 }
1074 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1075
1076 /* Now deal with 2 cases.
1077 * 1)If no space for a new title exists lets just restore
1078 * the old book properties. Remember, if the book had
1079 * matchd an older entry on the titlelist, we shouldnt
1080 * have called this routine in the first place!
1081 * 2) If we got a unique title, we need to add it to
1082 * the list.
1083 */
1084
1085 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1086 { /* got to check maxnames again */
1087#ifdef ARCHIVE_DEBUG
1088 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1089#endif
1090 /* restore old book properties here */
1091 book->title = old_title;
1092
1093 if (RANDOM () % 4)
1094 {
1095 /* Lets give the book a description to individualize it some */
1096 char new_name[MAX_BUF];
1097
1098 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1099
1100 book->name = new_name;
1101 }
1102 else 1089 else
1103 { 1090 {
1104 book->name = old_name; 1091 book->name = old_name;
1105 } 1092 }
1106 } 1093 }
1107 else if (book->title && strlen (book->msg) > 5) 1094 else if (book->title && strlen (book->msg) > 5)
1108 { /* archive if long msg texts */ 1095 { /* archive if long msg texts */
1109 add_book_to_list (book, msgtype); 1096 add_book_to_list (book, msgtype);
1110 } 1097 }
1111 } 1098 }
1112 break; 1099 break;
1113 } 1100 }
1114 1101
1115 default: 1102 default:
1116 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1103 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1117 return; 1104 return;
1118 } 1105 }
1119} 1106}
1120 1107
1121/***************************************************************************** 1108/*****************************************************************************
1122 * 1109 *
… …
1133 * list of all monsters in the current game. If level is non-zero, 1120 * list of all monsters in the current game. If level is non-zero,
1134 * then only monsters greater than that level will be returned. 1121 * then only monsters greater than that level will be returned.
1135 * Changed 971225 to be greater than equal to level passed. Also 1122 * Changed 971225 to be greater than equal to level passed. Also
1136 * made choosing by level more random. 1123 * made choosing by level more random.
1137 */ 1124 */
1138
1139object * 1125object *
1140get_random_mon (int level) 1126get_random_mon (int level)
1141{ 1127{
1142 objectlink *mon = first_mon_info; 1128 objectlink *mon = first_mon_info;
1143 int i = 0, monnr; 1129 int i = 0, monnr;
… …
1147 return (object *) NULL; 1133 return (object *) NULL;
1148 1134
1149 if (!level) 1135 if (!level)
1150 { 1136 {
1151 /* lets get a random monster from the mon_info linked list */ 1137 /* lets get a random monster from the mon_info linked list */
1152 monnr = RANDOM () % nrofmon; 1138 monnr = rndm (nrofmon);
1153 1139
1154 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1140 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1155 if (i++ == monnr) 1141 if (i++ == monnr)
1156 break; 1142 break;
1157 1143
… …
1184 { 1170 {
1185 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level); 1171 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
1186 return NULL; 1172 return NULL;
1187 } 1173 }
1188 1174
1189 monnr = RANDOM () % i; 1175 monnr = rndm (i);
1190 for (mon = first_mon_info; mon; mon = mon->next) 1176 for (mon = first_mon_info; mon; mon = mon->next)
1191 if (mon->ob->level >= level && monnr-- == 0) 1177 if (mon->ob->level >= level && monnr-- == 0)
1192 return mon->ob; 1178 return mon->ob;
1193 1179
1194 if (!mon) 1180 if (!mon)
… …
1201 1187
1202/* 1188/*
1203 * Returns a description of the monster. This really needs to be 1189 * Returns a description of the monster. This really needs to be
1204 * redone, as describe_item really gives a pretty internal description. 1190 * redone, as describe_item really gives a pretty internal description.
1205 */ 1191 */
1206 1192static const char *
1207char *
1208mon_desc (const object *mon) 1193mon_desc (const object *mon)
1209{ 1194{
1210 static char retbuf[HUGE_BUF]; 1195 static dynbuf_text buf; buf.clear ();
1211 1196
1212 sprintf (retbuf, " *** %s ***\n", &mon->name); 1197 buf.printf ("B<< %s >>\r", &mon->name);
1213 strcat (retbuf, describe_item (mon, NULL)); 1198 buf << describe_item (mon, 0);
1214 1199
1215 return retbuf; 1200 return buf;
1216} 1201}
1217 1202
1218 1203
1219/* This function returns the next monsters after 'tmp'. If no match is 1204/* This function returns the next monsters after 'tmp'. If no match is
1220 * found, it returns NULL (changed 0.94.3 to do this, since the 1205 * found, it returns NULL (changed 0.94.3 to do this, since the
1221 * calling function (mon_info_msg) seems to expect that. 1206 * calling function (mon_info_msg) seems to expect that.
1222 */ 1207 */
1223 1208static object *
1224object *
1225get_next_mon (object *tmp) 1209get_next_mon (object *tmp)
1226{ 1210{
1227 objectlink *mon; 1211 objectlink *mon;
1228 1212
1229 for (mon = first_mon_info; mon; mon = mon->next) 1213 for (mon = first_mon_info; mon; mon = mon->next)
… …
1238 else 1222 else
1239 return first_mon_info->ob; 1223 return first_mon_info->ob;
1240 1224
1241} 1225}
1242 1226
1243
1244
1245/* mon_info_msg() - generate a message detailing the properties 1227/* mon_info_msg() - generate a message detailing the properties
1246 * of a randomly selected monster. 1228 * of a randomly selected monster.
1247 */ 1229 */
1248 1230static const char *
1249char *
1250mon_info_msg (int level, int booksize) 1231mon_info_msg (int level, int booksize)
1251{ 1232{
1252 static char retbuf[BOOK_BUF]; 1233 static dynbuf_text buf; buf.clear ();
1253 char tmpbuf[HUGE_BUF];
1254 object *tmp;
1255 1234
1256 /*preamble */ 1235 /*preamble */
1257 strcpy (retbuf, "This beastiary contains:"); 1236 buf << "This beastiary contains:\n";
1258 1237
1259 /* lets print info on as many monsters as will fit in our 1238 /* lets print info on as many monsters as will fit in our
1260 * document. 1239 * document.
1261 * 8-96 Had to change this a bit, otherwise there would 1240 * 8-96 Had to change this a bit, otherwise there would
1262 * have been an impossibly large number of combinations 1241 * have been an impossibly large number of combinations
1263 * of text! (and flood out the available number of titles 1242 * of text! (and flood out the available number of titles
1264 * in the archive in a snap!) -b.t. 1243 * in the archive in a snap!) -b.t.
1265 */ 1244 */
1266 tmp = get_random_mon (level * 3); 1245 object *tmp = get_random_mon (level * 3);
1267 while (tmp) 1246 while (tmp && buf.size () < BOOK_BUF)
1268 { 1247 {
1269 /* monster description */ 1248 /* monster description */
1270 sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp)); 1249 buf.printf ("\n%s\n", mon_desc (tmp));
1271
1272 if (!book_overflow (retbuf, tmpbuf, booksize))
1273 strcat (retbuf, tmpbuf);
1274 else
1275 break;
1276 1250
1277 /* Note that the value this returns is not based on level */ 1251 /* Note that the value this returns is not based on level */
1278 tmp = get_next_mon (tmp); 1252 tmp = get_next_mon (tmp);
1279 } 1253 }
1280 1254
1281#ifdef BOOK_MSG_DEBUG
1282 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf));
1283 fprintf (logfile, " MADE THIS:\n%s\n", retbuf);
1284#endif
1285
1286 return retbuf; 1255 return buf;
1287} 1256}
1288 1257
1289 1258
1290/***************************************************************************** 1259/*****************************************************************************
1291 * Artifact msg generation code. 1260 * Artifact msg generation code.
1292 ****************************************************************************/ 1261 ****************************************************************************/
1293 1262
1294/* artifact_msg() - generate a message detailing the properties 1263/* artifact_msg() - generate a message detailing the properties
1295 * of 1-6 artifacts drawn sequentially from the artifact list. 1264 * of 1-6 artifacts drawn sequentially from the artifact list.
1296 */ 1265 */
1297const char * 1266static const char *
1298artifact_msg (int level, int booksize) 1267artifact_msg (int level, int booksize)
1299{ 1268{
1300 artifactlist *al = NULL; 1269 artifactlist *al = NULL;
1301 artifact *art; 1270 artifact *art;
1302 int chance, i, type, index; 1271 int chance, i, type, index;
1303 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1272 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1304 const char *ch; 1273 const char *ch;
1305 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1274 char name[MAX_BUF];
1306 static char retbuf[BOOK_BUF];
1307 object *tmp = NULL; 1275 object *tmp = NULL;
1276
1277 static dynbuf_text buf; buf.clear ();
1308 1278
1309 /* values greater than 5 create msg buffers that are too big! */ 1279 /* values greater than 5 create msg buffers that are too big! */
1310 if (book_entries > 5) 1280 if (book_entries > 5)
1311 book_entries = 5; 1281 book_entries = 5;
1312 1282
… …
1316 * for that type exists! 1286 * for that type exists!
1317 */ 1287 */
1318 i = 0; 1288 i = 0;
1319 do 1289 do
1320 { 1290 {
1321 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1291 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1322 type = art_name_array[index].type; 1292 type = art_name_array[index].type;
1323 al = find_artifactlist (type); 1293 al = find_artifactlist (type);
1324 i++; 1294 i++;
1325 } 1295 }
1326 while ((al == NULL) && (i < 10)); 1296 while ((al == NULL) && (i < 10));
… …
1329 return "None"; 1299 return "None";
1330 1300
1331 /* There is no reason to start on the artifact list at the begining. Lets 1301 /* There is no reason to start on the artifact list at the begining. Lets
1332 * take our starting position randomly... */ 1302 * take our starting position randomly... */
1333 art = al->items; 1303 art = al->items;
1334 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1304 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1335 { 1305 {
1336 if (art == NULL) 1306 if (!art)
1337 art = al->items; /* hmm, out of stuff, loop back around */ 1307 art = al->items; /* hmm, out of stuff, loop back around */
1308
1338 art = art->next; 1309 art = art->next;
1339 } 1310 }
1340 1311
1341 /* the base 'generic' name for our artifact */ 1312 /* the base 'generic' name for our artifact */
1342 assign (name, art_name_array[index].name); 1313 assign (name, art_name_array[index].name);
1343 1314
1344 /* Ok, lets print out the contents */ 1315 /* Ok, lets print out the contents */
1345 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1316 buf.printf ("Herein %s detailed %s...\n",
1317 book_entries > 1 ? "are" : "is",
1318 book_entries > 1 ? "some artifacts" : "an artifact");
1346 1319
1347 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1320 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
1348 * as long as we have space up to the allowed max # (book_entires) 1321 * as long as we have space up to the allowed max # (book_entires)
1349 */ 1322 */
1350 while (book_entries > 0) 1323 while (book_entries > 0 && buf.size () < BOOK_BUF)
1351 { 1324 {
1352 1325
1353 if (art == NULL) 1326 if (!art)
1354 art = al->items; 1327 art = al->items;
1355 1328
1356 /* separator of items */ 1329 buf << '\n';
1357 strcpy (buf, "--- \n");
1358 1330
1359 /* Name */ 1331 /* Name */
1360 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1332 if (art->allowed && art->allowed->name != shstr_All)
1361 { 1333 {
1362 linked_char *temp, *next = art->allowed; 1334 linked_char *temp, *next = art->allowed;
1363 1335
1364 do 1336 do
1365 { 1337 {
1366 temp = next; 1338 temp = next;
1367 next = next->next; 1339 next = next->next;
1368 } 1340 }
1369 while (next && !RANDOM () % 2); 1341 while (next && rndm (2));
1342
1370 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1343 buf.printf ("A B<< %s of %s >>", &temp->name, &art->item->name);
1371 } 1344 }
1372 else /* default name is used */ 1345 else /* default name is used */
1373 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1346 buf.printf ("The B<< %s of %s >>", name, &art->item->name);
1347
1348 buf << " is ";
1374 1349
1375 /* chance of finding */ 1350 /* chance of finding */
1376 chance = (int) (100 * ((float) art->chance / al->total_chance)); 1351 chance = (int) (100 * ((float) art->chance / al->total_chance));
1377 if (chance >= 20) 1352 if (chance >= 20)
1378 sprintf (sbuf, "an uncommon"); 1353 buf << "an uncommon";
1379 else if (chance >= 10) 1354 else if (chance >= 10)
1380 sprintf (sbuf, "an unusual"); 1355 buf << "an unusual";
1381 else if (chance >= 5) 1356 else if (chance >= 5)
1382 sprintf (sbuf, "a rare"); 1357 buf << "a rare";
1383 else 1358 else
1384 sprintf (sbuf, "a very rare"); 1359 buf << "a very rare";
1385 sprintf (buf, "%s is %s\n", buf, sbuf);
1386 1360
1387 /* value of artifact */ 1361 /* value of artifact */
1388 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1362 buf << " item with a value that is " << art->item->value << " times normal.\n";
1389 1363
1390 /* include the message about the artifact, if exists, and book 1364 /* include the message about the artifact, if exists, and book
1391 * level is kinda high */ 1365 * level is kinda high */
1392 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1366 if (art->item->msg
1367 && rndm (4) + 1 < level)
1393 strcat (buf, art->item->msg); 1368 buf << art->item->msg;
1394 1369
1395 /* properties of the artifact */ 1370 /* properties of the artifact */
1396 tmp = object::create (); 1371 tmp = object::create ();
1397 add_abilities (tmp, art->item); 1372 add_abilities (tmp, art->item);
1398 tmp->type = type; 1373 tmp->type = type;
1399 SET_FLAG (tmp, FLAG_IDENTIFIED); 1374 SET_FLAG (tmp, FLAG_IDENTIFIED);
1400 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1375 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
1401 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1376 buf << "\rProperties of this artifact include:\r" << ch << "\n";
1377
1402 tmp->destroy (); 1378 tmp->destroy ();
1403 /* add the buf if it will fit */
1404 if (!book_overflow (retbuf, buf, booksize))
1405 strcat (retbuf, buf);
1406 else
1407 break;
1408 1379
1409 art = art->next; 1380 art = art->next;
1410 book_entries--; 1381 book_entries--;
1411 } 1382 }
1412 1383
1413#ifdef BOOK_MSG_DEBUG
1414 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf));
1415 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1416#endif
1417 return retbuf; 1384 return buf;
1418} 1385}
1419 1386
1420/***************************************************************************** 1387/*****************************************************************************
1421 * Spellpath message generation 1388 * Spellpath message generation
1422 *****************************************************************************/ 1389 *****************************************************************************/
1423 1390
1424/* spellpath_msg() - generate a message detailing the member 1391/* spellpath_msg() - generate a message detailing the member
1425 * incantations/prayers (and some of their properties) belonging to 1392 * incantations/prayers (and some of their properties) belonging to
1426 * a given spellpath. 1393 * a given spellpath.
1427 */ 1394 */
1428 1395static char *
1429char *
1430spellpath_msg (int level, int booksize) 1396spellpath_msg (int level, int booksize)
1431{ 1397{
1398 static dynbuf_text buf; buf.clear ();
1399
1432 static char retbuf[BOOK_BUF]; 1400 static char retbuf[BOOK_BUF];
1433 char tmpbuf[BOOK_BUF]; 1401 char tmpbuf[BOOK_BUF];
1434 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1402 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1435 int did_first_sp = 0;
1436 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1403 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1437 archetype *at; 1404 archetype *at;
1438 1405
1439 /* Preamble */ 1406 /* Preamble */
1440 sprintf (retbuf, "Herein are detailed the names of %s\n", prayers ? "prayers" : "incantations"); 1407 buf << "Herein are detailed the names of "
1408 << (prayers ? "prayers" : "incantations");
1441 1409
1442 if (path == -1) 1410 if (path == -1)
1443 strcat (retbuf, "having no known spell path.\n"); 1411 buf << " having no known spell path.\n";
1444 else 1412 else
1445 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1413 buf << " belonging to the path of B<< " << spellpathnames[path] << " >>:\n\n";
1446 1414
1447 for (at = first_archetype; at != NULL; at = at->next) 1415 int seen = 0;
1448 { 1416
1417 for_all_archetypes (at)
1449 /* Determine if this is an appropriate spell. Must 1418 /* Determine if this is an appropriate spell. Must
1450 * be of matching path, must be of appropriate type (prayer 1419 * be of matching path, must be of appropriate type (prayer
1451 * or not), and must be within the valid level range. 1420 * or not), and must be within the valid level range.
1452 */ 1421 */
1453 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1422 if (at->type == SPELL && at->path_attuned & pnum &&
1454 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8))) 1423 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1455 { 1424 {
1456 assign (tmpbuf, at->clone.name); 1425 seen = 1;
1457 1426 buf << at->object::name << '\r';
1458 if (book_overflow (retbuf, tmpbuf, booksize))
1459 break;
1460 else
1461 {
1462 if (did_first_sp)
1463 strcat (retbuf, ",\n");
1464 did_first_sp = 1;
1465 strcat (retbuf, tmpbuf);
1466 }
1467 } 1427 }
1468 } 1428
1469 /* Geez, no spells were generated. */ 1429 /* Geez, no spells were generated. */
1470 if (!did_first_sp) 1430 if (!seen)
1471 {
1472 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1431 if (rndm (4)) /* usually, lets make a recursive call... */
1473 spellpath_msg (level, booksize); 1432 return spellpath_msg (level, booksize);
1474 else /* give up, cause knowing no spells exist for path is info too. */ 1433 else /* give up, cause knowing no spells exist for path is info too. */
1475 strcat (retbuf, "\n - no known spells exist -\n"); 1434 buf << "- no known spells exist.\n";
1476 } 1435
1477 else
1478 {
1479 strcat (retbuf, "\n");
1480 }
1481 return retbuf; 1436 return buf;
1482} 1437}
1483 1438
1484/* formula_msg() - generate a message detailing the properties 1439/* formula_msg() - generate a message detailing the properties
1485 * of a randomly selected alchemical formula. 1440 * of a randomly selected alchemical formula.
1486 */ 1441 */
1487void 1442static void
1488make_formula_book (object *book, int level) 1443make_formula_book (object *book, int level)
1489{ 1444{
1490 char retbuf[BOOK_BUF], title[MAX_BUF]; 1445 char title[MAX_BUF];
1491 recipelist *fl; 1446 recipelist *fl;
1492 recipe *formula = NULL; 1447 recipe *formula = NULL;
1493 int chance; 1448 int chance;
1494 1449
1450 static dynbuf_text buf; buf.clear ();
1451
1495 /* the higher the book level, the more complex (ie number of 1452 /* the higher the book level, the more complex (ie number of
1496 * ingredients) the formula can be. 1453 * ingredients) the formula can be.
1497 */ 1454 */
1498 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1455 fl = get_formulalist (rndm (level) / 3 + 1);
1499 1456
1500 if (!fl) 1457 if (!fl)
1501 fl = get_formulalist (1); /* safety */ 1458 fl = get_formulalist (1); /* safety */
1502 1459
1503 if (fl->total_chance == 0) 1460 if (fl->total_chance == 0)
… …
1507 add_author (book, 4); 1464 add_author (book, 4);
1508 return; 1465 return;
1509 } 1466 }
1510 1467
1511 /* get a random formula, weighted by its bookchance */ 1468 /* get a random formula, weighted by its bookchance */
1512 chance = RANDOM () % fl->total_chance; 1469 chance = rndm (fl->total_chance);
1513 for (formula = fl->items; formula != NULL; formula = formula->next) 1470 for (formula = fl->items; formula; formula = formula->next)
1514 { 1471 {
1515 chance -= formula->chance; 1472 chance -= formula->chance;
1473
1516 if (chance <= 0) 1474 if (chance <= 0)
1517 break; 1475 break;
1518 } 1476 }
1519 1477
1520 if (!formula || formula->arch_names <= 0) 1478 if (!formula || formula->arch_names <= 0)
1521 { 1479 {
1522 book->msg = "<indecipherable text>\n"; 1480 book->msg = "<indecipherable text>\n";
1523 new_text_name (book, 4); 1481 new_text_name (book, 4);
1524 add_author (book, 4); 1482 add_author (book, 4);
1525 1483 return;
1526 } 1484 }
1485
1486 /* looks like a formula was found. Base the amount
1487 * of information on the booklevel and the spellevel
1488 * of the formula. */
1489
1490 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1491 archetype *at;
1492
1493 /* preamble */
1494 buf << "Herein is described a project using B<< "
1495 << (formula->skill ? &formula->skill : "an unknown skill")
1496 << " >>:\n\n";
1497
1498 if ((at = archetype::find (op_name)))
1499 op_name = at->object::name;
1527 else 1500 else
1501 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1502
1503 /* item name */
1504 if (formula->title != shstr_NONE)
1505 {
1506 buf.printf ("The B<< %s of %s >>", op_name, &formula->title);
1507 /* This results in things like pile of philo. sulfur.
1508 * while philo. sulfur may look better, without this,
1509 * you get things like 'the wise' because its missing the
1510 * water of section.
1511 */
1512 sprintf (title, "%s: %s of %s",
1513 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1528 { 1514 }
1529 /* looks like a formula was found. Base the amount 1515 else
1530 * of information on the booklevel and the spellevel 1516 {
1531 * of the formula. */ 1517 buf << "The B<< " << op_name;
1532 1518
1533 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1519 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1520 if (at->title)
1521 {
1522 buf << " " << at->title;
1523 strcat (title, " ");
1524 strcat (title, at->title);
1525 }
1526
1527 buf << " >>";
1528 }
1529
1530 /* Lets name the book something meaningful ! */
1531 book->name = title;
1532 book->title = NULL;
1533
1534 /* ingredients to make it */
1535 if (formula->ingred)
1536 {
1537 linked_char *next;
1534 archetype *at; 1538 archetype *at;
1535 1539
1536 /* preamble */
1537 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1538
1539 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1540 op_name = at->clone.name;
1541 else
1542 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1543
1544 /* item name */
1545 if (strcmp (formula->title, "NONE"))
1546 {
1547 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1548 /* This results in things like pile of philo. sulfur.
1549 * while philo. sulfur may look better, without this,
1550 * you get things like 'the wise' because its missing the
1551 * water of section.
1552 */
1553 sprintf (title, "%s: %s of %s",
1554 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1555 }
1556 else
1557 {
1558 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1559 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name);
1560 if (at->clone.title)
1561 {
1562 strcat (retbuf, " ");
1563 strcat (retbuf, at->clone.title);
1564 strcat (title, " ");
1565 strcat (title, at->clone.title);
1566 }
1567 }
1568 /* Lets name the book something meaningful ! */
1569 book->name = title;
1570 book->title = NULL;
1571
1572 /* ingredients to make it */
1573 if (formula->ingred != NULL)
1574 {
1575 linked_char *next;
1576 archetype *at;
1577
1578 at = archetype::find (formula->cauldron); 1540 at = archetype::find (formula->cauldron);
1579 1541
1580 sprintf (retbuf + strlen (retbuf), 1542 buf.printf (" may be made at %s using the following ingredients:\n\n",
1581 " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place"); 1543 at ? query_name (at) : "an appropriate place");
1582 1544
1583 for (next = formula->ingred; next != NULL; next = next->next) 1545 for (next = formula->ingred; next; next = next->next)
1584 { 1546 buf << next->name << '\r';
1585 strcat (retbuf, next->name); 1547 }
1586 strcat (retbuf, "\n");
1587 }
1588 }
1589 else 1548 else
1590 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title); 1549 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title);
1591 if (retbuf[strlen (retbuf) - 1] != '\n') 1550
1551 book->msg = buf;
1552}
1553
1554#define DESCRIBE_PATH(retbuf, variable, name) \
1555 if(variable) { \
1556 int i,j=0; \
1557 strcat(retbuf,"(" name ": "); \
1558 for(i=0; i<NRSPELLPATHS; i++) \
1559 if(variable & (1<<i)) { \
1560 if (j) \
1561 strcat(retbuf,", "); \
1562 else \
1563 j = 1; \
1564 strcat(retbuf, spellpathnames[i]); \
1565 } \
1592 strcat (retbuf, "\n"); 1566 strcat(retbuf,")"); \
1593
1594 book->msg = retbuf;
1595 } 1567 }
1596}
1597 1568
1598/* god_info_msg() - generate a message detailing the properties 1569/* god_info_msg() - generate a message detailing the properties
1599 * of a random god. Used by the book hack. b.t. 1570 * of a random god. Used by the book hack. b.t.
1600 */ 1571 */
1601const char * 1572static const char *
1602god_info_msg (int level, int booksize) 1573god_info_msg (int level, int booksize)
1603{ 1574{
1604 static char retbuf[BOOK_BUF];
1605 const char *name = NULL; 1575 const char *name = NULL;
1606 char buf[BOOK_BUF];
1607 int i;
1608 size_t introlen;
1609 object *god = pntr_to_god_obj (get_rand_god ()); 1576 object *god = pntr_to_god_obj (get_rand_god ());
1610 1577
1578 static dynbuf_text buf; buf.clear ();
1579
1611 if (!god) 1580 if (!god)
1612 return (char *) NULL; /* oops, problems... */ 1581 return 0; /* oops, problems... */
1582
1613 name = god->name; 1583 name = god->name;
1614 1584
1615 /* preamble.. */ 1585 /* preamble.. */
1616 sprintf (retbuf, "This document contains knowledge concerning\n"); 1586 buf << "This document contains knowledge concerning the diety B<< "
1617 sprintf (retbuf, "%sthe diety %s", retbuf, name); 1587 << name << " >>";
1618 1588
1619 /* Always have as default information the god's descriptive terms. */ 1589 /* Always have as default information the god's descriptive terms. */
1620 if (nstrtok (god->msg, ",") > 0) 1590 if (nstrtok (god->msg, ",") > 0)
1621 { 1591 buf << ", known as" << strtoktolin (god->msg, ",");
1622 strcat (retbuf, ", known as");
1623 strcat (retbuf, strtoktolin (god->msg, ","));
1624 }
1625 else 1592 else
1626 strcat (retbuf, "..."); 1593 buf << "...";
1627 1594
1628 strcat (retbuf, "\n ---\n"); 1595 buf << "\n\n";
1596
1629 introlen = strlen (retbuf); /* so we will know if no new info is added later */ 1597 int introlen = buf.size (); /* so we will know if no new info is added later */
1630 1598
1631 /* Information about the god is random, and based on the level of the 1599 /* Information about the god is random, and based on the level of the
1632 * 'book'. Probably there is a more intellegent way to implement 1600 * 'book'. Probably there is a more intellegent way to implement
1633 * this ... 1601 * this ...
1634 */ 1602 */
1635 1603 while (level > 0 && buf.size () < BOOK_BUF)
1636 while (level > 0)
1637 { 1604 {
1638 sprintf (buf, " ");
1639 if (level == 2 && RANDOM () % 2) 1605 if (level == 2 && rndm (2))
1640 { /* enemy god */ 1606 { /* enemy god */
1641 const char *enemy = god->title; 1607 const char *enemy = god->title;
1642 1608
1643 if (enemy) 1609 if (enemy)
1644 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1610 buf.printf ("The gods %s and %s are enemies.\r", name, enemy);
1645 } 1611 }
1646 1612
1647 if (level == 3 && RANDOM () % 2) 1613 if (level == 3 && rndm (2))
1648 { /* enemy race, what the god's holy word effects */ 1614 { /* enemy race, what the god's holy word effects */
1649 const char *enemy = god->slaying; 1615 const char *enemy = god->slaying;
1616 int i;
1650 1617
1651 if (enemy && !(god->path_denied & PATH_TURNING)) 1618 if (enemy && !(god->path_denied & PATH_TURNING))
1652 if ((i = nstrtok (enemy, ",")) > 0) 1619 if ((i = nstrtok (enemy, ",")) > 0)
1653 { 1620 {
1654 char tmpbuf[MAX_BUF]; 1621 char tmpbuf[MAX_BUF];
1655 1622
1656 sprintf (buf, "The holy words of %s have the power to\n", name); 1623 buf << "The holy words of " << name
1657 strcat (buf, "slay creatures belonging to the "); 1624 << " have the power to slay creatures belonging to the ";
1625
1658 if (i > 1) 1626 if (i > 1)
1659 sprintf (tmpbuf, "following \n races:%s", strtoktolin (enemy, ",")); 1627 buf << "following races:" << strtoktolin (enemy, ",");
1660 else 1628 else
1661 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1629 buf << "race of" << strtoktolin (enemy, ",");
1662 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1630
1631 buf << '\r';
1663 } 1632 }
1664 } 1633 }
1665 1634
1666 if (level == 4 && RANDOM () % 2) 1635 if (level == 4 && rndm (2))
1667 { /* Priest of god gets these protect,vulnerable... */ 1636 { /* Priest of god gets these protect,vulnerable... */
1668 char tmpbuf[MAX_BUF];
1669
1670 if (const char *cp = describe_resistance (god, 1)) 1637 if (const char *cp = describe_resistance (god, 1))
1671 { /* This god does have protections */ 1638 { /* This god does have protections */
1672 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1639 buf << name
1640 << " has a potent aura which is extended to"
1673 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1641 " faithful priests. The effects of this aura include: "
1674 strcat (tmpbuf, cp); 1642 << cp
1675 strcat (buf, tmpbuf); 1643 << ".\r";
1676 strcat (buf, "\n ---\n");
1677 } 1644 }
1678 else
1679 sprintf (buf, " ");
1680 } 1645 }
1681 1646
1682 if (level == 5 && RANDOM () % 2) 1647 if (level == 5 && rndm (2))
1683 { /* aligned race, summoning */ 1648 { /* aligned race, summoning */
1684 const char *race = god->race; /* aligned race */ 1649 const char *race = god->race; /* aligned race */
1650 int i;
1685 1651
1686 if (race && !(god->path_denied & PATH_SUMMON)) 1652 if (race && !(god->path_denied & PATH_SUMMON))
1687 if ((i = nstrtok (race, ",")) > 0) 1653 if ((i = nstrtok (race, ",")) > 0)
1688 { 1654 {
1689 char tmpbuf[MAX_BUF]; 1655 buf << "Creatures sacred to " << name << " include the ";
1690
1691 sprintf (buf, "Creatures sacred to %s include the \n", name);
1692 if (i > 1) 1656 if (i > 1)
1693 sprintf (tmpbuf, "following \n races:%s", strtoktolin (race, ",")); 1657 buf << "following races:" << strtoktolin (race, ",");
1694 else 1658 else
1695 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1659 buf << "race of" << strtoktolin (race, ",");
1696 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1660
1661 buf << '\r';
1697 } 1662 }
1698 } 1663 }
1699 1664
1700 if (level == 6 && RANDOM () % 2) 1665 if (level == 6 && rndm (2))
1701 { /* blessing,curse properties of the god */ 1666 { /* blessing,curse properties of the god */
1702 char tmpbuf[MAX_BUF];
1703
1704 if (const char *cp = describe_resistance (god, 1)) 1667 if (const char *cp = describe_resistance (god, 1))
1705 { /* This god does have protections */ 1668 { /* This god does have protections */
1706 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name); 1669 buf << "The priests of " << name
1670 << " are known to be able to "
1707 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1671 "bestow a blessing which makes the recipient "
1708 strcat (tmpbuf, cp); 1672 << cp
1709 strcat (buf, tmpbuf); 1673 << '\r';
1710 strcat (buf, "\n ---\n");
1711 } 1674 }
1712 else
1713 sprintf (buf, " ");
1714
1715 } 1675 }
1716 1676
1717 if (level == 8 && RANDOM () % 2) 1677 if (level == 8 && rndm (2))
1718 { /* immunity, holy possession */ 1678 { /* immunity, holy possession */
1719 int has_effect = 0, tmpvar; 1679 buf << "The priests of " << name
1720 char tmpbuf[MAX_BUF]; 1680 << " are known to make cast a mighty"
1681 " prayer of possession";
1682
1683 int first = 1;
1721 1684
1722 sprintf (tmpbuf, "\n");
1723 sprintf (tmpbuf, "The priests of %s are known to make cast a mighty \n", name);
1724
1725 strcat (tmpbuf, "prayer of possession which gives the recipient\n");
1726
1727 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++) 1685 for (int i = 0; i < NROFATTACKS; i++)
1686 if (god->resist[i] == 100)
1728 { 1687 {
1729 if (god->resist[tmpvar] == 100) 1688 if (first)
1730 { 1689 {
1690 buf << " which gives the recipient";
1731 has_effect = 1; 1691 first = 0;
1732 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1733 } 1692 }
1693 else
1694 buf << ", ";
1695
1696 buf << " immunity to " << attacktype_desc[i];
1734 } 1697 }
1735 1698
1736 if (has_effect) 1699 buf << ".\r";
1737 {
1738 strcat (buf, tmpbuf);
1739 strcat (buf, "\n ---\n");
1740 }
1741 else
1742 sprintf (buf, " ");
1743 } 1700 }
1744 1701
1745 if (level == 12 && RANDOM () % 2) 1702 if (level == 12 && rndm (2))
1746 { /* spell paths */ 1703 { /* spell paths */
1704 //TODO:
1747 int has_effect = 0, tmpvar; 1705 int has_effect = 0, tmpvar;
1748 char tmpbuf[MAX_BUF]; 1706 char tmpbuf[MAX_BUF];
1749 1707
1750 sprintf (tmpbuf, "\n"); 1708 sprintf (tmpbuf, "\n");
1751 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1709 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
… …
1768 has_effect = 1; 1726 has_effect = 1;
1769 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1727 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1770 } 1728 }
1771 1729
1772 if (has_effect) 1730 if (has_effect)
1773 { 1731 buf << tmpbuf << '\r';
1774 strcat (buf, tmpbuf);
1775 strcat (buf, "\n ---\n");
1776 }
1777 else 1732 else
1778 sprintf (buf, " "); 1733 buf << '\r';
1779 } 1734 }
1780 1735
1781 /* check to be sure new buffer size dont exceed either
1782 * the maximum buffer size, or the 'natural' size of the
1783 * book...
1784 */
1785 if (book_overflow (retbuf, buf, booksize))
1786 break;
1787 else if (strlen (buf) > 1)
1788 strcat (retbuf, buf);
1789
1790 level--; 1736 level--;
1791 } 1737 }
1792 1738
1793 if (strlen (retbuf) == introlen) 1739 if (buf.size () == introlen)
1794 { /* we got no information beyond the preamble! */ 1740 /* we got no information beyond the preamble! */
1795 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1741 buf << "[Unfortunately the rest of the information is hopelessly garbled!]";
1796 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1742
1797 }
1798#ifdef BOOK_MSG_DEBUG
1799 LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf));
1800 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1801#endif
1802 return retbuf; 1743 return buf;
1803} 1744}
1804 1745
1805/* tailor_readable_ob()- The main routine. This chooses a random 1746/* tailor_readable_ob()- The main routine. This chooses a random
1806 * message to put in given readable object (type==BOOK) which will 1747 * message to put in given readable object (type==BOOK) which will
1807 * be referred hereafter as a 'book'. We use the book level to de- 1748 * be referred hereafter as a 'book'. We use the book level to de-
… …
1820 */ 1761 */
1821void 1762void
1822tailor_readable_ob (object *book, int msg_type) 1763tailor_readable_ob (object *book, int msg_type)
1823{ 1764{
1824 char msgbuf[BOOK_BUF]; 1765 char msgbuf[BOOK_BUF];
1825 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1766 int level = book->level ? rndm (book->level) + 1 : 1;
1826 int book_buf_size; 1767 int book_buf_size;
1827 1768
1828 /* safety */ 1769 /* safety */
1829 if (book->type != BOOK) 1770 if (book->type != BOOK)
1830 return; 1771 return;
… …
1844 * 2) make sure there is an entry in max_titles[] array. 1785 * 2) make sure there is an entry in max_titles[] array.
1845 * 3) make sure there are entries for your case in new_text_title() 1786 * 3) make sure there are entries for your case in new_text_title()
1846 * and add_authour(). 1787 * and add_authour().
1847 * 4) you may want separate authour/book name arrays in read.h 1788 * 4) you may want separate authour/book name arrays in read.h
1848 */ 1789 */
1849
1850 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1790 msg_type = msg_type > 0 ? msg_type : rndm (8);
1851 switch (msg_type) 1791 switch (msg_type)
1852 { 1792 {
1853 case 1: /* monster attrib */ 1793 case 1: /* monster attrib */
1854 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1794 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1855 break; 1795 break;
… …
1861 break; 1801 break;
1862 case 4: /* describe an alchemy formula */ 1802 case 4: /* describe an alchemy formula */
1863 make_formula_book (book, level); 1803 make_formula_book (book, level);
1864 /* make_formula_book already gives title */ 1804 /* make_formula_book already gives title */
1865 return; 1805 return;
1866 break;
1867 case 5: /* bits of information about a god */ 1806 case 5: /* bits of information about a god */
1868 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1807 strcpy (msgbuf, god_info_msg (level, book_buf_size));
1869 break; 1808 break;
1870 case 0: /* use info list in lib/ */ 1809 case 0: /* use info list in lib/ */
1871 default: 1810 default:
1872 cfperl_make_book (book, level); 1811 cfperl_make_book (book, level);
1812 /* already gives title */
1873 return; 1813 return;
1874 } 1814 }
1875
1876 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1877 1815
1878 if (strlen (msgbuf) > 1) 1816 if (strlen (msgbuf) > 1)
1879 { 1817 {
1880 book->msg = msgbuf; 1818 book->msg = msgbuf;
1881 /* lets give the "book" a new name, which may be a compound word */ 1819 /* lets give the "book" a new name, which may be a compound word */
1882 change_book (book, msg_type); 1820 change_book (book, msg_type);
1883 } 1821 }
1884
1885} 1822}
1886 1823
1887 1824
1888/***************************************************************************** 1825/*****************************************************************************
1889 * 1826 *
… …
1899 linked_char *lmsg, *nextmsg; 1836 linked_char *lmsg, *nextmsg;
1900 objectlink *monlink, *nextmon; 1837 objectlink *monlink, *nextmon;
1901 1838
1902 LOG (llevDebug, "freeing all book information\n"); 1839 LOG (llevDebug, "freeing all book information\n");
1903 1840
1904 for (tlist = booklist; tlist != NULL; tlist = tnext) 1841 for (tlist = booklist; tlist; tlist = tnext)
1905 { 1842 {
1906 tnext = tlist->next; 1843 tnext = tlist->next;
1907 1844
1908 for (title1 = tlist->first_book; title1; title1 = titlenext) 1845 for (title1 = tlist->first_book; title1; title1 = titlenext)
1909 { 1846 {
… …
1984get_readable_message_type (object *readable) 1921get_readable_message_type (object *readable)
1985{ 1922{
1986 uint8 subtype = readable->subtype; 1923 uint8 subtype = readable->subtype;
1987 1924
1988 if (subtype > last_readable_subtype) 1925 if (subtype > last_readable_subtype)
1989 return &(readable_message_types[0]); 1926 return &readable_message_types[0];
1927
1990 return &(readable_message_types[subtype]); 1928 return &readable_message_types[subtype];
1991} 1929}

Diff Legend

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