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.5 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.51 by root, Fri Nov 6 13:03:34 2009 UTC

1
2/* 1/*
3 * static char *rcsid_readable_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 * "$Id: readable.C,v 1.5 2006/09/10 16:00:23 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
12 7 *
13 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
14 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
15 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
16 (at your option) any later version. 11 * option) any later version.
17 12 *
18 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,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details. 16 * GNU General Public License for more details.
22 17 *
23 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
24 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
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
26 21 *
27 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <support@deliantra.net>
28*/ 23 */
29
30 24
31/* This file contains code relevant to the BOOKS hack -- designed 25/* This file contains code relevant to the BOOKS hack -- designed
32 * to allow randomly occuring messages in non-magical texts. 26 * to allow randomly occuring messages in non-magical texts.
33 */ 27 */
34 28
… …
36 30
37#include <global.h> 31#include <global.h>
38#include <book.h> 32#include <book.h>
39#include <living.h> 33#include <living.h>
40#include <spells.h> 34#include <spells.h>
41
42 35
43/* Define this if you want to archive book titles by contents. 36/* Define this if you want to archive book titles by contents.
44 * This option should enforce UNIQUE combinations of titles,authors and 37 * This option should enforce UNIQUE combinations of titles,authors and
45 * msg contents during and *between* game sessions. 38 * msg contents during and *between* game sessions.
46 * 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
… …
80/* Moved these structures from struct.h to this file in 0.94.3 - they 73/* Moved these structures from struct.h to this file in 0.94.3 - they
81 * are not needed anyplace else, so why have them globally declared? 74 * are not needed anyplace else, so why have them globally declared?
82 */ 75 */
83 76
84/* 'title' and 'titlelist' are used by the readable code */ 77/* 'title' and 'titlelist' are used by the readable code */
85typedef struct titlestruct:zero_initialised 78struct title : zero_initialised
86{ 79{
87 shstr name; /* the name of the book */ 80 shstr name; /* the name of the book */
88 shstr authour; /* the name of the book authour */ 81 shstr authour; /* the name of the book authour */
89 shstr archname; /* the archetype name of the book */ 82 shstr archname; /* the archetype name of the book */
90 int level; /* level of difficulty of this message */ 83 int level; /* level of difficulty of this message */
91 int size; /* size of the book message */ 84 int size; /* size of the book message */
92 int msg_index; /* an index value derived from book message */ 85 int msg_index; /* an index value derived from book message */
93 struct titlestruct *next; 86 title *next;
94} title; 87};
95 88
96typedef struct titleliststruct:zero_initialised 89struct titlelist : zero_initialised
97{ 90{
98 int number; /* number of items in the list */ 91 int number; /* number of items in the list */
99 struct titlestruct *first_book; /* pointer to first book in this list */ 92 title *first_book; /* pointer to first book in this list */
100 struct titleliststruct *next; /* pointer to next book list */ 93 titlelist *next; /* pointer to next book list */
101} titlelist; 94};
102 95
103/* special structure, used only by art_name_array[] */ 96/* special structure, used only by art_name_array[] */
104 97struct arttypename
105typedef struct namebytype
106{ 98{
107 const char *name; /* generic name to call artifacts of this type */ 99 const char *name; /* generic name to call artifacts of this type */
108 int type; /* matching type */ 100 int type; /* matching type */
109} 101};
110arttypename;
111
112 102
113/* booklist is the buffer of books read in from the bookarch file */ 103/* booklist is the buffer of books read in from the bookarch file */
114static titlelist *booklist = NULL; 104static titlelist *booklist = NULL;
115 105
116static objectlink *first_mon_info = NULL; 106static objectlink *first_mon_info = NULL;
… …
119 * pointers to all (hostile) monster objects */ 109 * pointers to all (hostile) monster objects */
120 110
121static int nrofmon = 0, need_to_write_bookarchive = 0; 111static int nrofmon = 0, need_to_write_bookarchive = 0;
122 112
123 113
124/* this is needed to keep track of status of initialization 114/* this is needed to keep track of status of initialisation
125 * of the message file */ 115 * of the message file */
126static int nrofmsg = 0; 116static int nrofmsg = 0;
127 117
128/* first_msg is the started of the linked list of messages as read from 118/* first_msg is the started of the linked list of messages as read from
129 * the messages file 119 * the messages file
… …
196 {"Shield", SHIELD}, 186 {"Shield", SHIELD},
197 {"Bracers", BRACERS}, 187 {"Bracers", BRACERS},
198 {"Boots", BOOTS}, 188 {"Boots", BOOTS},
199 {"Cloak", CLOAK}, 189 {"Cloak", CLOAK},
200 {"Gloves", GLOVES}, 190 {"Gloves", GLOVES},
201 {"Gridle", GIRDLE}, 191 {"Girdle", GIRDLE},
202 {"Ring", RING}, 192 {"Ring", RING},
203 {"Horn", HORN}, 193 {"Horn", HORN},
204 {"Missile Weapon", BOW}, 194 {"Missile Weapon", BOW},
205 {"Missile", ARROW}, 195 {"Missile", ARROW},
206 {"Hand Weapon", WEAPON}, 196 {"Hand Weapon", WEAPON},
… …
444 * 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
445 * 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
446 * subtype paramater in arch files! 436 * subtype paramater in arch files!
447 */ 437 */
448static readable_message_type readable_message_types[] = { 438static readable_message_type readable_message_types[] = {
449 /*subtype 0 */ {0, 0}, 439 /*subtype 0 */ {0, 0, "info"},
450 /* book messages subtypes */ 440 /* book messages subtypes */
451 /*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"},
452 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2}, 442 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2, "readable-book-clasp-2"},
453 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1}, 443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1, "readable-book-elegant-1"},
454 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2}, 444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2, "readable-book-elegant-2"},
455 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1}, 445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1, "readable-book-quarto-1"},
456 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2}, 446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2, "readable-book-quarto-2"},
457 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER}, 447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER, "readable-book-spell-evocation"},
458 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER}, 448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER, "readable-book-spell-praying"},
459 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO}, 449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO, "readable-book-spell-pyromancy"},
460 /*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"},
461 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER}, 451 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER, "readable-book-spell-summoning"},
462 /* card messages subtypes */ 452 /* card messages subtypes */
463 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1}, 453 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1, "readable-card-simple-1"},
464 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2}, 454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2, "readable-card-simple-2"},
465 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3}, 455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3, "readable-card-simple-3"},
466 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1}, 456 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1, "readable-card-elegant-1"},
467 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2}, 457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2, "readable-card-elegant-2"},
468 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3}, 458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3, "readable-card-elegant-3"},
469 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1}, 459 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1, "readable-card-strange-1"},
470 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2}, 460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2, "readable-card-strange-2"},
471 /*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"},
472 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1}, 462 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1, "readable-card-money-1"},
473 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2}, 463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2, "readable-card-money-2"},
474 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3}, 464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3, "readable-card-money-3"},
475 465
476 /* Paper messages subtypes */ 466 /* Paper messages subtypes */
477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1}, 467 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1, "readable-paper-note-1"},
478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2}, 468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2, "readable-paper-note-2"},
479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3}, 469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3, "readable-paper-note-3"},
480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1}, 470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1, "readable-paper-letter-old-1"},
481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2}, 471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2, "readable-paper-letter-old-2"},
482 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1}, 472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1, "readable-paper-letter-new-1"},
483 /*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"},
484 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1}, 474 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1, "readable-paper-envelope-1"},
485 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2}, 475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2, "readable-paper-envelope-2"},
486 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1}, 476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1, "readable-paper-scroll-old-1"},
487 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2}, 477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2, "readable-paper-scroll-old-2"},
488 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1}, 478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1, "readable-paper-scroll-new-1"},
489 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2}, 479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2, "readable-paper-scroll-new-2"},
490 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC}, 480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC, "readable-paper-scroll-magic"},
491 481
492 /* road signs messages subtypes */ 482 /* road signs messages subtypes */
493 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC}, 483 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC, "readable-sign-basic"},
494 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT}, 484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT, "readable-sign-dir-left"},
495 /*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"},
496 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH}, 486 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH, "readable-sign-dir-both"},
497 487
498 /* stones and monument messages */ 488 /* stones and monument messages */
499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1}, 489 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1, "readable-monument-stone-1"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2}, 490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2, "readable-monument-stone-2"},
501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3}, 491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3, "readable-monument-stone-3"},
502 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1}, 492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1, "readable-monument-statue-1"},
503 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2}, 493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2, "readable-monument-statue-2"},
504 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3}, 494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3, "readable-monument-statue-3"},
505 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1}, 495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1, "readable-monument-gravestone-1"},
506 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2}, 496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2, "readable-monument-gravestone-2"},
507 /*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"},
508 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1}, 498 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
509 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2}, 499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
510 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3} 500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
511}; 501};
512int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 502static int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
513 503
514static int max_titles[6] = { 504static int max_titles[6] = {
515 ((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 *)),
516 (sizeof (mon_book_name) / sizeof (char *)) * (sizeof (mon_author) / sizeof (char *)), 506 (sizeof (mon_book_name) / sizeof (char *)) * (sizeof (mon_author) / sizeof (char *)),
517 (sizeof (art_book_name) / sizeof (char *)) * (sizeof (art_author) / sizeof (char *)), 507 (sizeof (art_book_name) / sizeof (char *)) * (sizeof (art_author) / sizeof (char *)),
… …
565 555
566 while (tl && number) 556 while (tl && number)
567 { 557 {
568 if (!tl->next) 558 if (!tl->next)
569 tl->next = get_empty_booklist (); 559 tl->next = get_empty_booklist ();
560
570 tl = tl->next; 561 tl = tl->next;
571 number--; 562 number--;
572 } 563 }
573 564
574 return tl; 565 return tl;
… …
578 * (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. */
579 570
580/* nstrtok() - simple routine to return the number of list 571/* nstrtok() - simple routine to return the number of list
581 * items in buf1 as separated by the value of buf2 572 * items in buf1 as separated by the value of buf2
582 */ 573 */
583 574static int
584int
585nstrtok (const char *buf1, const char *buf2) 575nstrtok (const char *buf1, const char *buf2)
586{ 576{
587 char *tbuf, sbuf[12], buf[MAX_BUF]; 577 char *tbuf, sbuf[12], buf[MAX_BUF];
588 int number = 0; 578 int number = 0;
589 579
… …
602 592
603/* strtoktolin() - takes a string in buf1 and separates it into 593/* strtoktolin() - takes a string in buf1 and separates it into
604 * a list of strings delimited by buf2. Then returns a comma 594 * a list of strings delimited by buf2. Then returns a comma
605 * separated string w/ decent punctuation. 595 * separated string w/ decent punctuation.
606 */ 596 */
607 597static char *
608char *
609strtoktolin (const char *buf1, const char *buf2) 598strtoktolin (const char *buf1, const char *buf2)
610{ 599{
611 int maxi, i = nstrtok (buf1, buf2); 600 int maxi, i = nstrtok (buf1, buf2);
612 char *tbuf, buf[MAX_BUF], sbuf[12]; 601 char *tbuf, buf[MAX_BUF], sbuf[12];
613 static char rbuf[BOOK_BUF]; 602 static char rbuf[BOOK_BUF];
… …
630 tbuf = strtok (NULL, sbuf); 619 tbuf = strtok (NULL, sbuf);
631 } 620 }
632 return (char *) rbuf; 621 return (char *) rbuf;
633} 622}
634 623
635int 624static int
636book_overflow (const char *buf1, const char *buf2, int booksize) 625book_overflow (const char *buf1, const char *buf2, int booksize)
637{ 626{
638
639 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 */
640 || buf_overflow (buf1, buf2, booksize)) 628 || buf_overflow (buf1, buf2, booksize))
641 return 1; 629 return 1;
630
642 return 0; 631 return 0;
643
644
645} 632}
646 633
647/***************************************************************************** 634/*****************************************************************************
648 * 635 *
649 * Start of initialization related functions. 636 * Start of initialisation related functions.
650 * 637 *
651 ****************************************************************************/ 638 ****************************************************************************/
652 639
653/* init_msgfile() - if not called before, initialize the info list
654 * reads the messages file into the list pointed to by first_msg
655*/
656
657static void
658init_msgfile (void)
659{
660 FILE *fp;
661 char buf[MAX_BUF], msgbuf[HUGE_BUF], fname[MAX_BUF], *cp;
662 int comp;
663 static int did_init_msgfile;
664
665 if (did_init_msgfile)
666 return;
667 did_init_msgfile = 1;
668
669 sprintf (fname, "%s/messages", settings.datadir);
670 LOG (llevDebug, "Reading messages from %s...", fname);
671
672 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
673 {
674 linked_char *tmp = NULL;
675
676 while (fgets (buf, MAX_BUF, fp) != NULL)
677 {
678 if (*buf == '#')
679 continue;
680 if ((cp = strchr (buf, '\n')) != NULL)
681 *cp = '\0';
682 cp = buf;
683 while (*cp == ' ') /* Skip blanks */
684 cp++;
685 if (!strncmp (cp, "ENDMSG", 6))
686 {
687 if (strlen (msgbuf) > BOOK_BUF)
688 {
689 LOG (llevDebug, "Warning: this string exceeded max book buf size:");
690 LOG (llevDebug, " %s", msgbuf);
691 }
692 tmp->name = msgbuf;
693 tmp->next = first_msg;
694 first_msg = tmp;
695 nrofmsg++;
696 continue;
697 }
698 else if (!strncmp (cp, "MSG", 3))
699 {
700 tmp = new linked_char;
701
702 strcpy (msgbuf, " "); /* reset msgbuf for new message */
703 continue;
704 }
705 else if (!buf_overflow (msgbuf, cp, HUGE_BUF - 1))
706 {
707 strcat (msgbuf, cp);
708 strcat (msgbuf, "\n");
709 }
710 }
711 close_and_delete (fp, comp);
712 }
713
714#ifdef BOOK_MSG_DEBUG
715 LOG (llevDebug, "\ninit_info_listfile() got %d messages.\n", nrofmsg);
716#endif
717 LOG (llevDebug, "done.\n");
718}
719
720
721/* init_book_archive() - if not called before, initialize the info list 640/* init_book_archive() - if not called before, initialise the info list
722 * This reads in the bookarch file into memory. bookarch is the file 641 * This reads in the bookarch file into memory. bookarch is the file
723 * created and updated across multiple runs of the program. 642 * created and updated across multiple runs of the program.
724 */ 643 */
725
726static void 644static void
727init_book_archive (void) 645init_book_archive (void)
728{ 646{
729 FILE *fp; 647 FILE *fp;
730 int comp, nroftitle = 0; 648 int comp, nroftitle = 0;
… …
733 titlelist *bl = get_empty_booklist (); 651 titlelist *bl = get_empty_booklist ();
734 static int did_init_barch; 652 static int did_init_barch;
735 653
736 if (did_init_barch) 654 if (did_init_barch)
737 return; 655 return;
656
738 did_init_barch = 1; 657 did_init_barch = 1;
739 658
740 if (!booklist) 659 if (!booklist)
741 booklist = bl; 660 booklist = bl;
742 661
… …
795 book->next = bl->first_book; 714 book->next = bl->first_book;
796 bl->first_book = book; 715 bl->first_book = book;
797 bl->number++; 716 bl->number++;
798 } 717 }
799 } 718 }
800 LOG (llevDebug, " book archives(used/avail): "); 719 LOG (llevDebug, "book archives(used/avail): \n");
801 for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++) 720 for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++)
802 { 721 {
803 LOG (llevDebug, "(%d/%d)", bl->number, max_titles[i]); 722 LOG (llevDebug, " (%d/%d)\n", bl->number, max_titles[i]);
804 } 723 }
805 LOG (llevDebug, "\n");
806 close_and_delete (fp, comp); 724 close_and_delete (fp, comp);
807 } 725 }
808 726
809#ifdef BOOK_MSG_DEBUG 727#ifdef BOOK_MSG_DEBUG
810 LOG (llevDebug, "\n init_book_archive() got %d titles.\n", nroftitle); 728 LOG (llevDebug, "init_book_archive() got %d titles.\n", nroftitle);
811#endif 729#endif
812 LOG (llevDebug, " done.\n"); 730 LOG (llevDebug, " done.\n");
813} 731}
814 732
815/* init_mon_info() - creates the linked list of pointers to 733/* init_mon_info() - creates the linked list of pointers to
816 * monster archetype objects if not called previously 734 * monster archetype objects if not called previously
817 */ 735 */
818
819static void 736static void
820init_mon_info (void) 737init_mon_info ()
821{ 738{
822 archetype *at; 739 archetype *at;
823 static int did_init_mon_info = 0; 740 static int did_init_mon_info = 0;
824 741
825 if (did_init_mon_info) 742 if (did_init_mon_info)
826 return; 743 return;
744
827 did_init_mon_info = 1; 745 did_init_mon_info = 1;
828 746
829 747 for_all_archetypes (at)
830 for (at = first_archetype; at != NULL; at = at->next) 748 if (at->flag [FLAG_MONSTER]
831 { 749 && at->is_head ()
832 if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE))) 750 && (!at->flag [FLAG_CHANGING] || at->flag [FLAG_UNAGGRESSIVE]))
833 { 751 {
834 objectlink *mon = (objectlink *) malloc (sizeof (objectlink)); 752 objectlink *mon = new objectlink;
835 753
836 mon->ob = &at->clone; 754 mon->ob = at;
837 mon->id = nrofmon;
838 mon->next = first_mon_info; 755 mon->next = first_mon_info;
839 first_mon_info = mon; 756 first_mon_info = mon;
840 nrofmon++; 757 nrofmon++;
841 } 758 }
842 } 759
843 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 760 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
844} 761}
845 762
846
847/* init_readable() - initialize linked lists utilized by 763/* init_readable() - initialise linked lists utilized by
848 * message functions in tailor_readable_ob() 764 * message functions in tailor_readable_ob()
849 * 765 *
850 * This is the function called by the main routine to initialize 766 * This is the function called by the main routine to initialise
851 * all the readable information. 767 * all the readable information.
852 */ 768 */
853
854void 769void
855init_readable (void) 770init_readable (void)
856{ 771{
857 static int did_this; 772 static int did_this;
858 773
859 if (did_this) 774 if (did_this)
860 return; 775 return;
776
861 did_this = 1; 777 did_this = 1;
862 778
863 LOG (llevDebug, "Initializing reading data..."); 779 LOG (llevDebug, "Initialising reading data...\n");
864 init_msgfile ();
865 init_book_archive (); 780 init_book_archive ();
866 init_mon_info (); 781 init_mon_info ();
867 LOG (llevDebug, " Done\n"); 782 LOG (llevDebug, " Done\n");
868
869} 783}
870 784
871/***************************************************************************** 785/*****************************************************************************
872 * 786 *
873 * This is the start of the administrative functions when creating 787 * This is the start of the administrative functions when creating
874 * new books (ie, updating title and the like) 788 * new books (ie, updating title and the like)
875 * 789 *
876 *****************************************************************************/ 790 *****************************************************************************/
877 791
878
879/* find_title() - Search the titlelist (based on msgtype) to see if 792/* find_title() - Search the titlelist (based on msgtype) to see if
880 * book matches something already there. IF so, return that title. 793 * book matches something already there. IF so, return that title.
881 */ 794 */
882
883static title * 795static title *
884find_title (const object *book, int msgtype) 796find_title (const object *book, int msgtype)
885{ 797{
886 title *t = NULL; 798 title *t = NULL;
887 titlelist *tl = get_titlelist (msgtype); 799 titlelist *tl = get_titlelist (msgtype);
… …
891 if (msgtype < 0) 803 if (msgtype < 0)
892 return (title *) NULL; 804 return (title *) NULL;
893 805
894 if (tl) 806 if (tl)
895 t = tl->first_book; 807 t = tl->first_book;
808
896 while (t) 809 while (t)
897 if (t->size == length && t->msg_index == index) 810 if (t->size == length && t->msg_index == index)
898 break; 811 break;
899 else 812 else
900 t = t->next; 813 t = t->next;
901 814
902#ifdef ARCHIVE_DEBUG 815#ifdef ARCHIVE_DEBUG
903 if (t) 816 if (t)
904 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, t->name, t->authour, t->msg_index); 817 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, &t->name, &t->authour, t->msg_index);
905#endif 818#endif
906 819
907 return t; 820 return t;
908} 821}
909 822
… …
911 * handled directly in change_book_name(). Names are based on text 824 * handled directly in change_book_name(). Names are based on text
912 * msgtype 825 * msgtype
913 * this sets book book->name based on msgtype given. What name 826 * this sets book book->name based on msgtype given. What name
914 * is given is based on various criteria 827 * is given is based on various criteria
915 */ 828 */
916
917static void 829static void
918new_text_name (object *book, int msgtype) 830new_text_name (object *book, int msgtype)
919{ 831{
920 int nbr; 832 int nbr;
921 char name[MAX_BUF]; 833 char name[MAX_BUF];
… …
923 if (book->type != BOOK) 835 if (book->type != BOOK)
924 return; 836 return;
925 837
926 switch (msgtype) 838 switch (msgtype)
927 { 839 {
928 case 1: /*monster */ 840 case 1: /*monster */
929 nbr = sizeof (mon_book_name) / sizeof (char *); 841 nbr = sizeof (mon_book_name) / sizeof (char *);
930 strcpy (name, mon_book_name[RANDOM () % nbr]); 842 assign (name, mon_book_name[rndm (nbr)]);
931 break; 843 break;
932 case 2: /*artifact */ 844 case 2: /*artifact */
933 nbr = sizeof (art_book_name) / sizeof (char *); 845 nbr = sizeof (art_book_name) / sizeof (char *);
934 strcpy (name, art_book_name[RANDOM () % nbr]); 846 assign (name, art_book_name[rndm (nbr)]);
935 break; 847 break;
936 case 3: /*spellpath */ 848 case 3: /*spellpath */
937 nbr = sizeof (path_book_name) / sizeof (char *); 849 nbr = sizeof (path_book_name) / sizeof (char *);
938 strcpy (name, path_book_name[RANDOM () % nbr]); 850 assign (name, path_book_name[rndm (nbr)]);
939 break; 851 break;
940 case 4: /*alchemy */ 852 case 4: /*alchemy */
941 nbr = sizeof (formula_book_name) / sizeof (char *); 853 nbr = sizeof (formula_book_name) / sizeof (char *);
942 strcpy (name, formula_book_name[RANDOM () % nbr]); 854 assign (name, formula_book_name[rndm (nbr)]);
943 break; 855 break;
944 case 5: /*gods */ 856 case 5: /*gods */
945 nbr = sizeof (gods_book_name) / sizeof (char *); 857 nbr = sizeof (gods_book_name) / sizeof (char *);
946 strcpy (name, gods_book_name[RANDOM () % nbr]); 858 assign (name, gods_book_name[rndm (nbr)]);
947 break; 859 break;
948 case 6: /*msg file */ 860 case 6: /*msg file */
949 default: 861 default:
950 if (book->weight > 2000) 862 if (book->weight > 2000)
951 { /* based on weight */ 863 { /* based on weight */
952 nbr = sizeof (heavy_book_name) / sizeof (char *); 864 nbr = sizeof (heavy_book_name) / sizeof (char *);
953 strcpy (name, heavy_book_name[RANDOM () % nbr]); 865 assign (name, heavy_book_name[rndm (nbr)]);
954 } 866 }
955 else if (book->weight < 2001) 867 else if (book->weight < 2001)
956 { 868 {
957 nbr = sizeof (light_book_name) / sizeof (char *); 869 nbr = sizeof (light_book_name) / sizeof (char *);
958 strcpy (name, light_book_name[RANDOM () % nbr]); 870 assign (name, light_book_name[rndm (nbr)]);
959 } 871 }
960 break; 872 break;
961 } 873 }
962 874
963 book->name = name; 875 book->name = name;
964} 876}
965 877
… …
977 if (msgtype < 0 || strlen (op->msg) < 5) 889 if (msgtype < 0 || strlen (op->msg) < 5)
978 return; 890 return;
979 891
980 switch (msgtype) 892 switch (msgtype)
981 { 893 {
982 case 1: /* monster */ 894 case 1: /* monster */
983 nbr = sizeof (mon_author) / sizeof (char *); 895 nbr = sizeof (mon_author) / sizeof (char *);
984 strcpy (name, mon_author[RANDOM () % nbr]); 896 assign (name, mon_author[rndm (nbr)]);
985 break; 897 break;
986 case 2: /* artifacts */ 898 case 2: /* artifacts */
987 nbr = sizeof (art_author) / sizeof (char *); 899 nbr = sizeof (art_author) / sizeof (char *);
988 strcpy (name, art_author[RANDOM () % nbr]); 900 assign (name, art_author[rndm (nbr)]);
989 break; 901 break;
990 case 3: /* spellpath */ 902 case 3: /* spellpath */
991 nbr = sizeof (path_author) / sizeof (char *); 903 nbr = sizeof (path_author) / sizeof (char *);
992 strcpy (name, path_author[RANDOM () % nbr]); 904 assign (name, path_author[rndm (nbr)]);
993 break; 905 break;
994 case 4: /* alchemy */ 906 case 4: /* alchemy */
995 nbr = sizeof (formula_author) / sizeof (char *); 907 nbr = sizeof (formula_author) / sizeof (char *);
996 strcpy (name, formula_author[RANDOM () % nbr]); 908 assign (name, formula_author[rndm (nbr)]);
997 break; 909 break;
998 case 5: /* gods */ 910 case 5: /* gods */
999 nbr = sizeof (gods_author) / sizeof (char *); 911 nbr = sizeof (gods_author) / sizeof (char *);
1000 strcpy (name, gods_author[RANDOM () % nbr]); 912 assign (name, gods_author[rndm (nbr)]);
1001 break; 913 break;
1002 case 6: /* msg file */ 914 case 6: /* msg file */
1003 default: 915 default:
1004 strcpy (name, book_author[RANDOM () % nbr]); 916 assign (name, book_author[rndm (nbr)]);
1005 } 917 }
1006 918
1007 sprintf (title, "of %s", name); 919 sprintf (title, "of %s", name);
1008 op->title = title; 920 op->title = title;
1009} 921}
… …
1014 */ 926 */
1015 927
1016static int 928static int
1017unique_book (const object *book, int msgtype) 929unique_book (const object *book, int msgtype)
1018{ 930{
1019 title *test;
1020
1021 if (!booklist) 931 if (!booklist)
1022 return 1; /* No archival entries! Must be unique! */ 932 return 1; /* No archival entries! Must be unique! */
1023 933
1024 /* Go through the booklist. If the author and name match, not unique so 934 /* Go through the booklist. If the author and name match, not unique so
1025 * return 0. 935 * return 0.
1026 */ 936 */
1027 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 937 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
1028 {
1029 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 938 if (test->name == book->name && book->title == test->authour)
1030 return 0; 939 return 0;
1031 } 940
1032 return 1; 941 return 1;
1033} 942}
1034 943
1035/* add_book_to_list() */ 944/* add_book_to_list() */
1036 945
… …
1049 t = get_empty_book (); 958 t = get_empty_book ();
1050 t->name = book->name; 959 t->name = book->name;
1051 t->authour = book->title; 960 t->authour = book->title;
1052 t->size = strlen (book->msg); 961 t->size = strlen (book->msg);
1053 t->msg_index = strtoint (book->msg); 962 t->msg_index = strtoint (book->msg);
1054 t->archname = book->arch->name; 963 t->archname = book->arch->archname;
1055 t->level = book->level; 964 t->level = book->level;
1056 965
1057 t->next = tl->first_book; 966 t->next = tl->first_book;
1058 tl->first_book = t; 967 tl->first_book = t;
1059 tl->number++; 968 tl->number++;
1060 969
1061 /* We have stuff we need to write now */ 970 /* We have stuff we need to write now */
1062 need_to_write_bookarchive = 1; 971 need_to_write_bookarchive = 1;
1063 972
1064#ifdef ARCHIVE_DEBUG 973#ifdef ARCHIVE_DEBUG
1065 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", book->name, book->title, msgtype); 974 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", &book->name, &book->title, msgtype);
1066#endif 975#endif
1067 976
1068} 977}
1069 978
1070 979
… …
1076 * levels and architypes. -b.t. 985 * levels and architypes. -b.t.
1077 */ 986 */
1078 987
1079#define MAX_TITLE_CHECK 20 988#define MAX_TITLE_CHECK 20
1080 989
1081void 990static void
1082change_book (object *book, int msgtype) 991change_book (object *book, int msgtype)
1083{ 992{
1084 int nbr = sizeof (book_descrpt) / sizeof (char *); 993 int nbr = sizeof (book_descrpt) / sizeof (char *);
1085 994
1086 switch (book->type) 995 switch (book->type)
1087 { 996 {
1088 case BOOK: 997 case BOOK:
1089 { 998 {
1090 titlelist *tl = get_titlelist (msgtype); 999 titlelist *tl = get_titlelist (msgtype);
1091 title *t = NULL; 1000 title *t = NULL;
1092 int tries = 0; 1001 int tries = 0;
1093 1002
1094 /* look to see if our msg already been archived. If so, alter 1003 /* look to see if our msg already been archived. If so, alter
1095 * the book to match the archival text. If we fail to match, 1004 * the book to match the archival text. If we fail to match,
1096 * then we archive the new title/name/msg combo if there is 1005 * then we archive the new title/name/msg combo if there is
1097 * room on the titlelist. 1006 * room on the titlelist.
1098 */ 1007 */
1099 1008
1100 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1009 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1101 { 1010 {
1102 object *tmpbook;
1103
1104 /* alter book properties */ 1011 /* alter book properties */
1105 if ((tmpbook = get_archetype (t->archname)) != NULL) 1012 if (object *tmpbook = get_archetype (t->archname))
1013 {
1014 tmpbook->msg = book->msg;
1015 tmpbook->copy_to (book);
1016 tmpbook->destroy ();
1017 }
1018
1019 book->title = t->authour;
1020 book->name = t->name;
1021 book->level = t->level;
1022 }
1023 /* Don't have any default title, so lets make up a new one */
1024 else
1025 {
1026 int numb, maxnames = max_titles[msgtype];
1027 const char *old_title;
1028 const char *old_name;
1029
1030 old_title = book->title;
1031 old_name = book->name;
1032
1033 /* some pre-generated books have title already set (from
1034 * maps), also don't bother looking for unique title if
1035 * we already used up all the available names! */
1036
1037 if (!tl)
1038 {
1039 LOG (llevError, "change_book_name(): can't find title list\n");
1040 numb = 0;
1041 }
1042 else
1043 numb = tl->number;
1044
1045 if (numb == maxnames)
1046 {
1047#ifdef ARCHIVE_DEBUG
1048 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1049#endif
1050 }
1051 /* shouldnt change map-maker books */
1052 else if (!book->title)
1053 do
1106 { 1054 {
1107 tmpbook->msg = book->msg; 1055 /* random book name */
1108 copy_object (tmpbook, book); 1056 new_text_name (book, msgtype);
1109 free_object (tmpbook); 1057 add_author (book, msgtype); /* random author */
1058 tries++;
1110 } 1059 }
1060 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1111 1061
1112 book->title = t->authour; 1062 /* Now deal with 2 cases.
1113 book->name = t->name; 1063 * 1)If no space for a new title exists lets just restore
1114 book->level = t->level; 1064 * the old book properties. Remember, if the book had
1065 * matchd an older entry on the titlelist, we shouldnt
1066 * have called this routine in the first place!
1067 * 2) If we got a unique title, we need to add it to
1068 * the list.
1115 } 1069 */
1116 /* Don't have any default title, so lets make up a new one */
1117 else
1118 {
1119 int numb, maxnames = max_titles[msgtype];
1120 const char *old_title;
1121 const char *old_name;
1122 1070
1123 old_title = book->title; 1071 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1124 old_name = book->name; 1072 { /* got to check maxnames again */
1125
1126 /* some pre-generated books have title already set (from
1127 * maps), also don't bother looking for unique title if
1128 * we already used up all the available names! */
1129
1130 if (!tl)
1131 {
1132 LOG (llevError, "change_book_name(): can't find title list\n");
1133 numb = 0;
1134 }
1135 else
1136 numb = tl->number;
1137
1138 if (numb == maxnames)
1139 {
1140#ifdef ARCHIVE_DEBUG 1073#ifdef ARCHIVE_DEBUG
1141 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1074 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
1142#endif 1075#endif
1143 break; 1076 /* restore old book properties here */
1144 } 1077 book->title = old_title;
1145 /* shouldnt change map-maker books */ 1078
1146 else if (!book->title) 1079 if (rndm (4))
1147 do
1148 { 1080 {
1149 /* random book name */ 1081 /* Lets give the book a description to individualize it some */
1150 new_text_name (book, msgtype); 1082 char new_name[MAX_BUF];
1151 add_author (book, msgtype); /* random author */ 1083
1152 tries++; 1084 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1085
1086 book->name = new_name;
1153 } 1087 }
1154 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1155
1156 /* Now deal with 2 cases.
1157 * 1)If no space for a new title exists lets just restore
1158 * the old book properties. Remember, if the book had
1159 * matchd an older entry on the titlelist, we shouldnt
1160 * have called this routine in the first place!
1161 * 2) If we got a unique title, we need to add it to
1162 * the list.
1163 */
1164
1165 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1166 { /* got to check maxnames again */
1167#ifdef ARCHIVE_DEBUG
1168 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1169#endif
1170 /* restore old book properties here */
1171 book->title = old_title;
1172
1173 if (RANDOM () % 4)
1174 {
1175 /* Lets give the book a description to individualize it some */
1176 char new_name[MAX_BUF];
1177
1178 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[RANDOM () % nbr], old_name);
1179
1180 book->name = new_name;
1181 }
1182 else 1088 else
1183 { 1089 {
1184 book->name = old_name; 1090 book->name = old_name;
1185 } 1091 }
1186 } 1092 }
1187 else if (book->title && strlen (book->msg) > 5) 1093 else if (book->title && strlen (book->msg) > 5)
1188 { /* archive if long msg texts */ 1094 { /* archive if long msg texts */
1189 add_book_to_list (book, msgtype); 1095 add_book_to_list (book, msgtype);
1190 } 1096 }
1191 } 1097 }
1192 break; 1098 break;
1193 } 1099 }
1194 1100
1195 default: 1101 default:
1196 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1102 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1197 return; 1103 return;
1198 } 1104 }
1199} 1105}
1200 1106
1201/***************************************************************************** 1107/*****************************************************************************
1202 * 1108 *
… …
1213 * list of all monsters in the current game. If level is non-zero, 1119 * list of all monsters in the current game. If level is non-zero,
1214 * then only monsters greater than that level will be returned. 1120 * then only monsters greater than that level will be returned.
1215 * Changed 971225 to be greater than equal to level passed. Also 1121 * Changed 971225 to be greater than equal to level passed. Also
1216 * made choosing by level more random. 1122 * made choosing by level more random.
1217 */ 1123 */
1218
1219object * 1124object *
1220get_random_mon (int level) 1125get_random_mon (int level)
1221{ 1126{
1222 objectlink *mon = first_mon_info; 1127 objectlink *mon = first_mon_info;
1223 int i = 0, monnr; 1128 int i = 0, monnr;
… …
1227 return (object *) NULL; 1132 return (object *) NULL;
1228 1133
1229 if (!level) 1134 if (!level)
1230 { 1135 {
1231 /* lets get a random monster from the mon_info linked list */ 1136 /* lets get a random monster from the mon_info linked list */
1232 monnr = RANDOM () % nrofmon; 1137 monnr = rndm (nrofmon);
1233 1138
1234 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1139 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1235 if (i++ == monnr) 1140 if (i++ == monnr)
1236 break; 1141 break;
1237 1142
… …
1264 { 1169 {
1265 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level); 1170 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
1266 return NULL; 1171 return NULL;
1267 } 1172 }
1268 1173
1269 monnr = RANDOM () % i; 1174 monnr = rndm (i);
1270 for (mon = first_mon_info; mon; mon = mon->next) 1175 for (mon = first_mon_info; mon; mon = mon->next)
1271 if (mon->ob->level >= level && monnr-- == 0) 1176 if (mon->ob->level >= level && monnr-- == 0)
1272 return mon->ob; 1177 return mon->ob;
1273 1178
1274 if (!mon) 1179 if (!mon)
… …
1281 1186
1282/* 1187/*
1283 * Returns a description of the monster. This really needs to be 1188 * Returns a description of the monster. This really needs to be
1284 * redone, as describe_item really gives a pretty internal description. 1189 * redone, as describe_item really gives a pretty internal description.
1285 */ 1190 */
1286 1191static const char *
1287char *
1288mon_desc (const object *mon) 1192mon_desc (const object *mon)
1289{ 1193{
1290 static char retbuf[HUGE_BUF]; 1194 static dynbuf_text buf; buf.clear ();
1291 1195
1292 sprintf (retbuf, " *** %s ***\n", &mon->name); 1196 buf.printf ("B<< %s >>\r", &mon->name);
1293 strcat (retbuf, describe_item (mon, NULL)); 1197 buf << describe_item (mon, 0);
1294 1198
1295 return retbuf; 1199 return buf;
1296} 1200}
1297 1201
1298 1202
1299/* This function returns the next monsters after 'tmp'. If no match is 1203/* This function returns the next monsters after 'tmp'. If no match is
1300 * found, it returns NULL (changed 0.94.3 to do this, since the 1204 * found, it returns NULL (changed 0.94.3 to do this, since the
1301 * calling function (mon_info_msg) seems to expect that. 1205 * calling function (mon_info_msg) seems to expect that.
1302 */ 1206 */
1303 1207static object *
1304object *
1305get_next_mon (object *tmp) 1208get_next_mon (object *tmp)
1306{ 1209{
1307 objectlink *mon; 1210 objectlink *mon;
1308 1211
1309 for (mon = first_mon_info; mon; mon = mon->next) 1212 for (mon = first_mon_info; mon; mon = mon->next)
… …
1311 break; 1214 break;
1312 1215
1313 /* didn't find a match */ 1216 /* didn't find a match */
1314 if (!mon) 1217 if (!mon)
1315 return NULL; 1218 return NULL;
1219
1316 if (mon->next) 1220 if (mon->next)
1317 return mon->next->ob; 1221 return mon->next->ob;
1318 else 1222 else
1319 return first_mon_info->ob; 1223 return first_mon_info->ob;
1320 1224
1321} 1225}
1322 1226
1323
1324
1325/* mon_info_msg() - generate a message detailing the properties 1227/* mon_info_msg() - generate a message detailing the properties
1326 * of a randomly selected monster. 1228 * of a randomly selected monster.
1327 */ 1229 */
1328 1230static const char *
1329char *
1330mon_info_msg (int level, int booksize) 1231mon_info_msg (int level)
1331{ 1232{
1332 static char retbuf[BOOK_BUF]; 1233 static dynbuf_text buf; buf.clear ();
1333 char tmpbuf[HUGE_BUF];
1334 object *tmp;
1335 1234
1336 /*preamble */ 1235 /*preamble */
1337 strcpy (retbuf, "This beastiary contains:"); 1236 buf << "This beastiary contains:\n";
1338 1237
1339 /* 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
1340 * document. 1239 * document.
1341 * 8-96 Had to change this a bit, otherwise there would 1240 * 8-96 Had to change this a bit, otherwise there would
1342 * have been an impossibly large number of combinations 1241 * have been an impossibly large number of combinations
1343 * of text! (and flood out the available number of titles 1242 * of text! (and flood out the available number of titles
1344 * in the archive in a snap!) -b.t. 1243 * in the archive in a snap!) -b.t.
1345 */ 1244 */
1346 tmp = get_random_mon (level * 3); 1245 object *tmp = get_random_mon (level * 3);
1347 while (tmp) 1246 while (tmp && buf.size () < BOOK_BUF)
1348 { 1247 {
1349 /* monster description */ 1248 /* monster description */
1350 sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp)); 1249 buf.printf ("\n%s\n", mon_desc (tmp));
1351
1352 if (!book_overflow (retbuf, tmpbuf, booksize))
1353 strcat (retbuf, tmpbuf);
1354 else
1355 break;
1356 1250
1357 /* Note that the value this returns is not based on level */ 1251 /* Note that the value this returns is not based on level */
1358 tmp = get_next_mon (tmp); 1252 tmp = get_next_mon (tmp);
1359 } 1253 }
1360 1254
1361#ifdef BOOK_MSG_DEBUG
1362 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf));
1363 fprintf (logfile, " MADE THIS:\n%s\n", retbuf);
1364#endif
1365
1366 return retbuf; 1255 return buf;
1367} 1256}
1368 1257
1369 1258
1370/***************************************************************************** 1259/*****************************************************************************
1371 * Artifact msg generation code. 1260 * Artifact msg generation code.
1372 ****************************************************************************/ 1261 ****************************************************************************/
1373 1262
1374/* artifact_msg() - generate a message detailing the properties 1263/* artifact_msg() - generate a message detailing the properties
1375 * of 1-6 artifacts drawn sequentially from the artifact list. 1264 * of 1-6 artifacts drawn sequentially from the artifact list.
1376 */ 1265 */
1377 1266static const char *
1378char *
1379artifact_msg (int level, int booksize) 1267artifact_msg (int level)
1380{ 1268{
1381 artifactlist *al = NULL; 1269 artifactlist *al = NULL;
1382 artifact *art; 1270 artifact *art;
1383 int chance, i, type, index; 1271 int chance, i, type, index;
1384 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;
1385 char *ch, name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1273 const char *ch;
1386 static char retbuf[BOOK_BUF]; 1274 char name[MAX_BUF];
1387 object *tmp = NULL; 1275 object *tmp = NULL;
1276
1277 static dynbuf_text buf; buf.clear ();
1388 1278
1389 /* values greater than 5 create msg buffers that are too big! */ 1279 /* values greater than 5 create msg buffers that are too big! */
1390 if (book_entries > 5) 1280 if (book_entries > 5)
1391 book_entries = 5; 1281 book_entries = 5;
1392 1282
… …
1396 * for that type exists! 1286 * for that type exists!
1397 */ 1287 */
1398 i = 0; 1288 i = 0;
1399 do 1289 do
1400 { 1290 {
1401 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1291 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1402 type = art_name_array[index].type; 1292 type = art_name_array[index].type;
1403 al = find_artifactlist (type); 1293 al = find_artifactlist (type);
1404 i++; 1294 i++;
1405 } 1295 }
1406 while ((al == NULL) && (i < 10)); 1296 while ((al == NULL) && (i < 10));
1407 1297
1408 if (i == 10) /* Unable to find a message */ 1298 if (i == 10) /* Unable to find a message */
1409 return ("None"); 1299 return "None";
1410 1300
1411 /* 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
1412 * take our starting position randomly... */ 1302 * take our starting position randomly... */
1413 art = al->items; 1303 art = al->items;
1414 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1304 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1415 { 1305 {
1416 if (art == NULL) 1306 if (!art)
1417 art = al->items; /* hmm, out of stuff, loop back around */ 1307 art = al->items; /* hmm, out of stuff, loop back around */
1308
1418 art = art->next; 1309 art = art->next;
1419 } 1310 }
1420 1311
1421 /* the base 'generic' name for our artifact */ 1312 /* the base 'generic' name for our artifact */
1422 strcpy (name, art_name_array[index].name); 1313 assign (name, art_name_array[index].name);
1423 1314
1424 /* Ok, lets print out the contents */ 1315 /* Ok, lets print out the contents */
1425 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");
1426 1319
1427 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1320 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
1428 * 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)
1429 */ 1322 */
1430 while (book_entries > 0) 1323 while (book_entries > 0 && buf.size () < BOOK_BUF)
1431 { 1324 {
1432 1325
1433 if (art == NULL) 1326 if (!art)
1434 art = al->items; 1327 art = al->items;
1435 1328
1436 /* separator of items */ 1329 buf << '\n';
1437 strcpy (buf, "--- \n");
1438 1330
1439 /* Name */ 1331 /* Name */
1440 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1332 if (art->allowed && art->allowed->name != shstr_All)
1441 { 1333 {
1442 linked_char *temp, *next = art->allowed; 1334 linked_char *temp, *next = art->allowed;
1443 1335
1444 do 1336 do
1445 { 1337 {
1446 temp = next; 1338 temp = next;
1447 next = next->next; 1339 next = next->next;
1448 } 1340 }
1449 while (next && !RANDOM () % 2); 1341 while (next && rndm (2));
1342
1450 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);
1451 } 1344 }
1452 else /* default name is used */ 1345 else /* default name is used */
1453 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 ";
1454 1349
1455 /* chance of finding */ 1350 /* chance of finding */
1456 chance = (int) (100 * ((float) art->chance / al->total_chance)); 1351 chance = (int) (100 * ((float) art->chance / al->total_chance));
1457 if (chance >= 20) 1352 if (chance >= 20)
1458 sprintf (sbuf, "an uncommon"); 1353 buf << "an uncommon";
1459 else if (chance >= 10) 1354 else if (chance >= 10)
1460 sprintf (sbuf, "an unusual"); 1355 buf << "an unusual";
1461 else if (chance >= 5) 1356 else if (chance >= 5)
1462 sprintf (sbuf, "a rare"); 1357 buf << "a rare";
1463 else 1358 else
1464 sprintf (sbuf, "a very rare"); 1359 buf << "a very rare";
1465 sprintf (buf, "%s is %s\n", buf, sbuf);
1466 1360
1467 /* value of artifact */ 1361 /* value of artifact */
1468 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";
1469 1363
1470 /* include the message about the artifact, if exists, and book 1364 /* include the message about the artifact, if exists, and book
1471 * level is kinda high */ 1365 * level is kinda high */
1472 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)
1473 strcat (buf, art->item->msg); 1368 buf << art->item->msg;
1474 1369
1475 /* properties of the artifact */ 1370 /* properties of the artifact */
1476 tmp = get_object (); 1371 tmp = object::create ();
1477 add_abilities (tmp, art->item); 1372 add_abilities (tmp, art->item);
1478 tmp->type = type; 1373 tmp->type = type;
1479 SET_FLAG (tmp, FLAG_IDENTIFIED); 1374 SET_FLAG (tmp, FLAG_IDENTIFIED);
1480 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1375 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
1481 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1376 buf << "\rProperties of this artifact include:\r" << ch << "\n";
1482 free_object (tmp); 1377
1483 /* add the buf if it will fit */ 1378 tmp->destroy ();
1484 if (!book_overflow (retbuf, buf, booksize))
1485 strcat (retbuf, buf);
1486 else
1487 break;
1488 1379
1489 art = art->next; 1380 art = art->next;
1490 book_entries--; 1381 book_entries--;
1491 } 1382 }
1492 1383
1493#ifdef BOOK_MSG_DEBUG
1494 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf));
1495 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1496#endif
1497 return retbuf; 1384 return buf;
1498} 1385}
1499 1386
1500/***************************************************************************** 1387/*****************************************************************************
1501 * Spellpath message generation 1388 * Spellpath message generation
1502 *****************************************************************************/ 1389 *****************************************************************************/
1503 1390
1504/* spellpath_msg() - generate a message detailing the member 1391/* spellpath_msg() - generate a message detailing the member
1505 * incantations/prayers (and some of their properties) belonging to 1392 * incantations/prayers (and some of their properties) belonging to
1506 * a given spellpath. 1393 * a given spellpath.
1507 */ 1394 */
1508 1395static char *
1509char *
1510spellpath_msg (int level, int booksize) 1396spellpath_msg (int level)
1511{ 1397{
1398 static dynbuf_text buf; buf.clear ();
1399
1512 static char retbuf[BOOK_BUF]; 1400 static char retbuf[BOOK_BUF];
1513 char tmpbuf[BOOK_BUF]; 1401 char tmpbuf[BOOK_BUF];
1514 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1402 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1515 int did_first_sp = 0;
1516 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1403 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1517 archetype *at; 1404 archetype *at;
1518 1405
1519 /* Preamble */ 1406 /* Preamble */
1520 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");
1521 1409
1522 if (path == -1) 1410 if (path == -1)
1523 strcat (retbuf, "having no known spell path.\n"); 1411 buf << " having no known spell path.\n";
1524 else 1412 else
1525 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1413 buf << " belonging to the path of B<< " << spellpathnames[path] << " >>:\n\n";
1526 1414
1527 for (at = first_archetype; at != NULL; at = at->next) 1415 int seen = 0;
1528 { 1416
1417 for_all_archetypes (at)
1529 /* Determine if this is an appropriate spell. Must 1418 /* Determine if this is an appropriate spell. Must
1530 * be of matching path, must be of appropriate type (prayer 1419 * be of matching path, must be of appropriate type (prayer
1531 * or not), and must be within the valid level range. 1420 * or not), and must be within the valid level range.
1532 */ 1421 */
1533 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1422 if (at->type == SPELL && at->path_attuned & pnum &&
1534 ((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)))
1535 { 1424 {
1536 strcpy (tmpbuf, at->clone.name); 1425 seen = 1;
1537 1426 buf << at->object::name << '\r';
1538 if (book_overflow (retbuf, tmpbuf, booksize))
1539 break;
1540 else
1541 {
1542 if (did_first_sp)
1543 strcat (retbuf, ",\n");
1544 did_first_sp = 1;
1545 strcat (retbuf, tmpbuf);
1546 }
1547 } 1427 }
1548 } 1428
1549 /* Geez, no spells were generated. */ 1429 /* Geez, no spells were generated. */
1550 if (!did_first_sp) 1430 if (!seen)
1551 {
1552 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1431 if (rndm (4)) /* usually, lets make a recursive call... */
1553 spellpath_msg (level, booksize); 1432 return spellpath_msg (level);
1554 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. */
1555 strcat (retbuf, "\n - no known spells exist -\n"); 1434 buf << "- no known spells exist.\n";
1556 } 1435
1557 else
1558 {
1559 strcat (retbuf, "\n");
1560 }
1561 return retbuf; 1436 return buf;
1562} 1437}
1563
1564
1565 1438
1566/* formula_msg() - generate a message detailing the properties 1439/* formula_msg() - generate a message detailing the properties
1567 * of a randomly selected alchemical formula. 1440 * of a randomly selected alchemical formula.
1568 */ 1441 */
1569 1442static void
1570void
1571make_formula_book (object *book, int level) 1443make_formula_book (object *book, int level)
1572{ 1444{
1573 char retbuf[BOOK_BUF], title[MAX_BUF]; 1445 char title[MAX_BUF];
1574 recipelist *fl; 1446 recipelist *fl;
1575 recipe *formula = NULL; 1447 recipe *formula = NULL;
1576 int chance; 1448 int chance;
1577 1449
1450 static dynbuf_text buf; buf.clear ();
1451
1578 /* the higher the book level, the more complex (ie number of 1452 /* the higher the book level, the more complex (ie number of
1579 * ingredients) the formula can be. 1453 * ingredients) the formula can be.
1580 */ 1454 */
1581 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1455 fl = get_formulalist (rndm (level) / 3 + 1);
1582 1456
1583 if (!fl) 1457 if (!fl)
1584 fl = get_formulalist (1); /* safety */ 1458 fl = get_formulalist (1); /* safety */
1585 1459
1586 if (fl->total_chance == 0) 1460 if (fl->total_chance == 0)
… …
1590 add_author (book, 4); 1464 add_author (book, 4);
1591 return; 1465 return;
1592 } 1466 }
1593 1467
1594 /* get a random formula, weighted by its bookchance */ 1468 /* get a random formula, weighted by its bookchance */
1595 chance = RANDOM () % fl->total_chance; 1469 chance = rndm (fl->total_chance);
1596 for (formula = fl->items; formula != NULL; formula = formula->next) 1470 for (formula = fl->items; formula; formula = formula->next)
1597 { 1471 {
1598 chance -= formula->chance; 1472 chance -= formula->chance;
1473
1599 if (chance <= 0) 1474 if (chance <= 0)
1600 break; 1475 break;
1601 } 1476 }
1602 1477
1603 if (!formula || formula->arch_names <= 0) 1478 if (!formula || formula->arch_names <= 0)
1604 { 1479 {
1605 book->msg = "<indecipherable text>\n"; 1480 book->msg = "<indecipherable text>\n";
1606 new_text_name (book, 4); 1481 new_text_name (book, 4);
1607 add_author (book, 4); 1482 add_author (book, 4);
1608 1483 return;
1609 } 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;
1610 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);
1611 { 1514 }
1612 /* looks like a formula was found. Base the amount 1515 else
1613 * of information on the booklevel and the spellevel 1516 {
1614 * of the formula. */ 1517 buf << "The B<< " << op_name;
1615 1518
1616 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;
1617 archetype *at; 1538 archetype *at;
1618 1539
1619 /* preamble */
1620 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1621
1622 if ((at = find_archetype (op_name)) != (archetype *) NULL)
1623 op_name = at->clone.name;
1624 else
1625 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1626
1627 /* item name */
1628 if (strcmp (formula->title, "NONE"))
1629 {
1630 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1631 /* This results in things like pile of philo. sulfur.
1632 * while philo. sulfur may look better, without this,
1633 * you get things like 'the wise' because its missing the
1634 * water of section.
1635 */
1636 sprintf (title, "%s: %s of %s",
1637 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1638 }
1639 else
1640 {
1641 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1642 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name);
1643 if (at->clone.title)
1644 {
1645 strcat (retbuf, " ");
1646 strcat (retbuf, at->clone.title);
1647 strcat (title, " ");
1648 strcat (title, at->clone.title);
1649 }
1650 }
1651 /* Lets name the book something meaningful ! */
1652 book->name = title;
1653 book->title = NULL;
1654
1655 /* ingredients to make it */
1656 if (formula->ingred != NULL)
1657 {
1658 linked_char *next;
1659 archetype *at;
1660
1661 at = find_archetype (formula->cauldron); 1540 at = archetype::find (formula->cauldron);
1662 1541
1663 sprintf (retbuf + strlen (retbuf), 1542 buf.printf (" may be made at %s using the following ingredients:\n\n",
1664 " 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");
1665 1544
1666 for (next = formula->ingred; next != NULL; next = next->next) 1545 for (next = formula->ingred; next; next = next->next)
1667 { 1546 buf << next->name << '\r';
1668 strcat (retbuf, next->name);
1669 strcat (retbuf, "\n");
1670 }
1671 }
1672 else
1673 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title);
1674 if (retbuf[strlen (retbuf) - 1] != '\n')
1675 strcat (retbuf, "\n");
1676
1677 book->msg = retbuf;
1678 }
1679}
1680
1681
1682/* msgfile_msg() - generate a message drawn randomly from a
1683 * file in lib/. Level currently has no effect on the message
1684 * which is returned.
1685 */
1686
1687char *
1688msgfile_msg (int level, int booksize)
1689{
1690 static char retbuf[BOOK_BUF];
1691 int i, msgnum;
1692 linked_char *msg = NULL;
1693
1694 /* get a random message for the 'book' from linked list */
1695 if (nrofmsg > 1)
1696 { 1547 }
1697 msg = first_msg;
1698 msgnum = RANDOM () % nrofmsg;
1699 for (i = 0; msg && i < nrofmsg && i != msgnum; i++)
1700 msg = msg->next;
1701 }
1702
1703 if (msg && !book_overflow (retbuf, msg->name, booksize))
1704 strcpy (retbuf, msg->name);
1705 else 1548 else
1706 sprintf (retbuf, "\n <undecipherable text>"); 1549 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title);
1707 1550
1708#ifdef BOOK_MSG_DEBUG 1551 book->msg = buf;
1709 LOG (llevDebug, "\n info_list_msg() created strng: %d\n", strlen (retbuf));
1710 LOG (llevDebug, " MADE THIS:\n%s\n", retbuf);
1711#endif
1712
1713 return retbuf;
1714} 1552}
1715 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 } \
1566 strcat(retbuf,")"); \
1567 }
1716 1568
1717/* god_info_msg() - generate a message detailing the properties 1569/* god_info_msg() - generate a message detailing the properties
1718 * of a random god. Used by the book hack. b.t. 1570 * of a random god. Used by the book hack. b.t.
1719 */ 1571 */
1720
1721const char * 1572static const char *
1722god_info_msg (int level, int booksize) 1573god_info_msg (int level)
1723{ 1574{
1724 static char retbuf[BOOK_BUF];
1725 const char *name = NULL; 1575 const char *name = NULL;
1726 char buf[BOOK_BUF];
1727 int i;
1728 size_t introlen;
1729 object *god = pntr_to_god_obj (get_rand_god ()); 1576 object *god = pntr_to_god_obj (get_rand_god ());
1730 1577
1578 static dynbuf_text buf; buf.clear ();
1579
1731 if (!god) 1580 if (!god)
1732 return (char *) NULL; /* oops, problems... */ 1581 return 0; /* oops, problems... */
1582
1733 name = god->name; 1583 name = god->name;
1734 1584
1735 /* preamble.. */ 1585 /* preamble.. */
1736 sprintf (retbuf, "This document contains knowledge concerning\n"); 1586 buf << "This document contains knowledge concerning the diety B<< "
1737 sprintf (retbuf, "%sthe diety %s", retbuf, name); 1587 << name << " >>";
1738 1588
1739 /* Always have as default information the god's descriptive terms. */ 1589 /* Always have as default information the god's descriptive terms. */
1740 if (nstrtok (god->msg, ",") > 0) 1590 if (nstrtok (god->msg, ",") > 0)
1741 { 1591 buf << ", known as" << strtoktolin (god->msg, ",");
1742 strcat (retbuf, ", known as");
1743 strcat (retbuf, strtoktolin (god->msg, ","));
1744 }
1745 else 1592 else
1746 strcat (retbuf, "..."); 1593 buf << "...";
1747 1594
1748 strcat (retbuf, "\n ---\n"); 1595 buf << "\n\n";
1596
1749 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 */
1750 1598
1751 /* 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
1752 * 'book'. Probably there is a more intellegent way to implement 1600 * 'book'. Probably there is a more intellegent way to implement
1753 * this ... 1601 * this ...
1754 */ 1602 */
1755 1603 while (level > 0 && buf.size () < BOOK_BUF)
1756 while (level > 0)
1757 { 1604 {
1758 sprintf (buf, " ");
1759 if (level == 2 && RANDOM () % 2) 1605 if (level == 2 && rndm (2))
1760 { /* enemy god */ 1606 { /* enemy god */
1761 const char *enemy = god->title; 1607 const char *enemy = god->title;
1762 1608
1763 if (enemy) 1609 if (enemy)
1764 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);
1765 } 1611 }
1612
1766 if (level == 3 && RANDOM () % 2) 1613 if (level == 3 && rndm (2))
1767 { /* enemy race, what the god's holy word effects */ 1614 { /* enemy race, what the god's holy word effects */
1768 const char *enemy = god->slaying; 1615 const char *enemy = god->slaying;
1616 int i;
1769 1617
1770 if (enemy && !(god->path_denied & PATH_TURNING)) 1618 if (enemy && !(god->path_denied & PATH_TURNING))
1771 if ((i = nstrtok (enemy, ",")) > 0) 1619 if ((i = nstrtok (enemy, ",")) > 0)
1772 { 1620 {
1773 char tmpbuf[MAX_BUF]; 1621 char tmpbuf[MAX_BUF];
1774 1622
1775 sprintf (buf, "The holy words of %s have the power to\n", name); 1623 buf << "The holy words of " << name
1776 strcat (buf, "slay creatures belonging to the "); 1624 << " have the power to slay creatures belonging to the ";
1625
1777 if (i > 1) 1626 if (i > 1)
1778 sprintf (tmpbuf, "following \n races:%s", strtoktolin (enemy, ",")); 1627 buf << "following races:" << strtoktolin (enemy, ",");
1779 else 1628 else
1780 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1629 buf << "race of" << strtoktolin (enemy, ",");
1781 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1630
1631 buf << '\r';
1782 } 1632 }
1783 } 1633 }
1634
1784 if (level == 4 && RANDOM () % 2) 1635 if (level == 4 && rndm (2))
1785 { /* Priest of god gets these protect,vulnerable... */ 1636 { /* Priest of god gets these protect,vulnerable... */
1786 char tmpbuf[MAX_BUF], *cp;
1787
1788 cp = describe_resistance (god, 1); 1637 if (const char *cp = describe_resistance (god, 1))
1789
1790 if (*cp)
1791 { /* This god does have protections */ 1638 { /* This god does have protections */
1792 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1639 buf << name
1640 << " has a potent aura which is extended to"
1793 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1641 " faithful priests. The effects of this aura include: "
1794 strcat (tmpbuf, cp); 1642 << cp
1795 strcat (buf, tmpbuf); 1643 << ".\r";
1796 strcat (buf, "\n ---\n");
1797 } 1644 }
1798 else
1799 sprintf (buf, " ");
1800 } 1645 }
1646
1801 if (level == 5 && RANDOM () % 2) 1647 if (level == 5 && rndm (2))
1802 { /* aligned race, summoning */ 1648 { /* aligned race, summoning */
1803 const char *race = god->race; /* aligned race */ 1649 const char *race = god->race; /* aligned race */
1650 int i;
1804 1651
1805 if (race && !(god->path_denied & PATH_SUMMON)) 1652 if (race && !(god->path_denied & PATH_SUMMON))
1806 if ((i = nstrtok (race, ",")) > 0) 1653 if ((i = nstrtok (race, ",")) > 0)
1807 { 1654 {
1808 char tmpbuf[MAX_BUF]; 1655 buf << "Creatures sacred to " << name << " include the ";
1809
1810 sprintf (buf, "Creatures sacred to %s include the \n", name);
1811 if (i > 1) 1656 if (i > 1)
1812 sprintf (tmpbuf, "following \n races:%s", strtoktolin (race, ",")); 1657 buf << "following races:" << strtoktolin (race, ",");
1813 else 1658 else
1814 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1659 buf << "race of" << strtoktolin (race, ",");
1815 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1660
1661 buf << '\r';
1816 } 1662 }
1817 } 1663 }
1664
1818 if (level == 6 && RANDOM () % 2) 1665 if (level == 6 && rndm (2))
1819 { /* blessing,curse properties of the god */ 1666 { /* blessing,curse properties of the god */
1820 char tmpbuf[MAX_BUF], *cp;
1821
1822 cp = describe_resistance (god, 1); 1667 if (const char *cp = describe_resistance (god, 1))
1823
1824 if (*cp)
1825 { /* This god does have protections */ 1668 { /* This god does have protections */
1826 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 "
1827 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1671 "bestow a blessing which makes the recipient "
1828 strcat (tmpbuf, cp); 1672 << cp
1829 strcat (buf, tmpbuf); 1673 << '\r';
1830 strcat (buf, "\n ---\n");
1831 } 1674 }
1832 else
1833 sprintf (buf, " ");
1834
1835 } 1675 }
1676
1836 if (level == 8 && RANDOM () % 2) 1677 if (level == 8 && rndm (2))
1837 { /* immunity, holy possession */ 1678 { /* immunity, holy possession */
1838 int has_effect = 0, tmpvar; 1679 buf << "The priests of " << name
1839 char tmpbuf[MAX_BUF]; 1680 << " are known to make cast a mighty"
1681 " prayer of possession";
1682
1683 int first = 1;
1840 1684
1841 sprintf (tmpbuf, "\n");
1842 sprintf (tmpbuf, "The priests of %s are known to make cast a mighty \n", name);
1843
1844 strcat (tmpbuf, "prayer of possession which gives the recipient\n");
1845
1846 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++) 1685 for (int i = 0; i < NROFATTACKS; i++)
1686 if (god->resist[i] == 100)
1847 { 1687 {
1848 if (god->resist[tmpvar] == 100) 1688 if (first)
1849 { 1689 {
1690 buf << " which gives the recipient";
1850 has_effect = 1; 1691 first = 0;
1851 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1852 } 1692 }
1693 else
1694 buf << ", ";
1695
1696 buf << " immunity to " << attacktype_desc[i];
1853 } 1697 }
1854 if (has_effect) 1698
1855 { 1699 buf << ".\r";
1856 strcat (buf, tmpbuf);
1857 strcat (buf, "\n ---\n");
1858 }
1859 else
1860 sprintf (buf, " ");
1861 } 1700 }
1701
1862 if (level == 12 && RANDOM () % 2) 1702 if (level == 12 && rndm (2))
1863 { /* spell paths */ 1703 { /* spell paths */
1704 //TODO:
1864 int has_effect = 0, tmpvar; 1705 int has_effect = 0, tmpvar;
1865 char tmpbuf[MAX_BUF]; 1706 char tmpbuf[MAX_BUF];
1866 1707
1867 sprintf (tmpbuf, "\n"); 1708 sprintf (tmpbuf, "\n");
1868 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);
1869 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n"); 1710 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n");
1711
1870 if ((tmpvar = god->path_attuned)) 1712 if ((tmpvar = god->path_attuned))
1871 { 1713 {
1872 has_effect = 1; 1714 has_effect = 1;
1873 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned"); 1715 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned");
1874 } 1716 }
1717
1875 if ((tmpvar = god->path_repelled)) 1718 if ((tmpvar = god->path_repelled))
1876 { 1719 {
1877 has_effect = 1; 1720 has_effect = 1;
1878 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled"); 1721 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled");
1879 } 1722 }
1723
1880 if ((tmpvar = god->path_denied)) 1724 if ((tmpvar = god->path_denied))
1881 { 1725 {
1882 has_effect = 1; 1726 has_effect = 1;
1883 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1727 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1884 } 1728 }
1729
1885 if (has_effect) 1730 if (has_effect)
1886 { 1731 buf << tmpbuf << '\r';
1887 strcat (buf, tmpbuf);
1888 strcat (buf, "\n ---\n");
1889 }
1890 else 1732 else
1891 sprintf (buf, " "); 1733 buf << '\r';
1892 } 1734 }
1893 1735
1894 /* check to be sure new buffer size dont exceed either
1895 * the maximum buffer size, or the 'natural' size of the
1896 * book...
1897 */
1898 if (book_overflow (retbuf, buf, booksize))
1899 break;
1900 else if (strlen (buf) > 1)
1901 strcat (retbuf, buf);
1902 level--; 1736 level--;
1903 } 1737 }
1904 if (strlen (retbuf) == introlen) 1738
1739 if (buf.size () == introlen)
1905 { /* we got no information beyond the preamble! */ 1740 /* we got no information beyond the preamble! */
1906 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1741 buf << "[Unfortunately the rest of the information is hopelessly garbled!]";
1907 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1742
1908 }
1909#ifdef BOOK_MSG_DEBUG
1910 LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf));
1911 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1912#endif
1913 return retbuf; 1743 return buf;
1914} 1744}
1915 1745
1916/* tailor_readable_ob()- The main routine. This chooses a random 1746/* tailor_readable_ob()- The main routine. This chooses a random
1917 * message to put in given readable object (type==BOOK) which will 1747 * message to put in given readable object (type==BOOK) which will
1918 * 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-
… …
1927 * book is the object we are creating into. 1757 * book is the object we are creating into.
1928 * If msg_type is a positive value, we use that to determine the 1758 * If msg_type is a positive value, we use that to determine the
1929 * message type - otherwise a random value is used. 1759 * message type - otherwise a random value is used.
1930 * 1760 *
1931 */ 1761 */
1932
1933void 1762void
1934tailor_readable_ob (object *book, int msg_type) 1763tailor_readable_ob (object *book, int msg_type)
1935{ 1764{
1936 char msgbuf[BOOK_BUF];
1937 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1765 int level = book->level ? rndm (book->level) + 1 : 1;
1938 int book_buf_size;
1939 1766
1940 /* safety */ 1767 /* safety */
1941 if (book->type != BOOK) 1768 if (book->type != BOOK)
1942 return; 1769 return;
1943 1770
1944 if (level <= 0) 1771 if (level <= 0)
1945 return; /* if no level no point in doing any more... */ 1772 return; /* if no level no point in doing any more... */
1946
1947 /* Max text length this book can have. */
1948 book_buf_size = BOOKSIZE (book);
1949 1773
1950 /* &&& The message switch &&& */ 1774 /* &&& The message switch &&& */
1951 /* Below all of the possible types of messages in the "book"s. 1775 /* Below all of the possible types of messages in the "book"s.
1952 */ 1776 */
1953 /* 1777 /*
… …
1956 * 2) make sure there is an entry in max_titles[] array. 1780 * 2) make sure there is an entry in max_titles[] array.
1957 * 3) make sure there are entries for your case in new_text_title() 1781 * 3) make sure there are entries for your case in new_text_title()
1958 * and add_authour(). 1782 * and add_authour().
1959 * 4) you may want separate authour/book name arrays in read.h 1783 * 4) you may want separate authour/book name arrays in read.h
1960 */ 1784 */
1961 1785 const char *new_msg = "";
1962 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1786 msg_type = msg_type > 0 ? msg_type : rndm (8);
1963 switch (msg_type) 1787 switch (msg_type)
1964 { 1788 {
1965 case 1: /* monster attrib */ 1789 case 1: /* monster attrib */
1966 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1790 new_msg = mon_info_msg (level);
1967 break; 1791 break;
1968 case 2: /* artifact attrib */ 1792 case 2: /* artifact attrib */
1969 strcpy (msgbuf, artifact_msg (level, book_buf_size)); 1793 new_msg = artifact_msg (level);
1970 break; 1794 break;
1971 case 3: /* grouping incantations/prayers by path */ 1795 case 3: /* grouping incantations/prayers by path */
1972 strcpy (msgbuf, spellpath_msg (level, book_buf_size)); 1796 new_msg = spellpath_msg (level);
1973 break; 1797 break;
1974 case 4: /* describe an alchemy formula */ 1798 case 4: /* describe an alchemy formula */
1975 make_formula_book (book, level); 1799 make_formula_book (book, level);
1976 /* make_formula_book already gives title */ 1800 /* make_formula_book already gives title */
1977 return; 1801 return;
1978 break;
1979 case 5: /* bits of information about a god */ 1802 case 5: /* bits of information about a god */
1980 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1803 new_msg = god_info_msg (level);
1981 break; 1804 break;
1982 case 0: /* use info list in lib/ */ 1805 case 0: /* use info list in lib/ */
1983 default: 1806 default:
1984 strcpy (msgbuf, msgfile_msg (level, book_buf_size)); 1807 cfperl_make_book (book, level);
1985 break; 1808 /* already gives title */
1809 return;
1986 } 1810 }
1987 1811
1988 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1989 if (strlen (msgbuf) > 1) 1812 if (strlen (new_msg) > 1)
1990 { 1813 {
1991 book->msg = msgbuf; 1814 book->msg = new_msg;
1992 /* lets give the "book" a new name, which may be a compound word */ 1815 /* lets give the "book" a new name, which may be a compound word */
1993 change_book (book, msg_type); 1816 change_book (book, msg_type);
1994 } 1817 }
1995
1996} 1818}
1997
1998 1819
1999/***************************************************************************** 1820/*****************************************************************************
2000 * 1821 *
2001 * Cleanup routine for readble stuff. 1822 * Cleanup routine for readble stuff.
2002 * 1823 *
2003 *****************************************************************************/ 1824 *****************************************************************************/
2004 1825static void
2005void
2006free_all_readable (void) 1826free_all_readable (void)
2007{ 1827{
2008 titlelist *tlist, *tnext; 1828 titlelist *tlist, *tnext;
2009 title *title1, *titlenext; 1829 title *title1, *titlenext;
2010 linked_char *lmsg, *nextmsg; 1830 linked_char *lmsg, *nextmsg;
2011 objectlink *monlink, *nextmon; 1831 objectlink *monlink, *nextmon;
2012 1832
2013 LOG (llevDebug, "freeing all book information\n"); 1833 LOG (llevDebug, "freeing all book information\n");
2014 1834
2015 for (tlist = booklist; tlist != NULL; tlist = tnext) 1835 for (tlist = booklist; tlist; tlist = tnext)
2016 { 1836 {
2017 tnext = tlist->next; 1837 tnext = tlist->next;
2018 1838
2019 for (title1 = tlist->first_book; title1; title1 = titlenext) 1839 for (title1 = tlist->first_book; title1; title1 = titlenext)
2020 { 1840 {
… …
2022 delete title1; 1842 delete title1;
2023 } 1843 }
2024 1844
2025 delete tlist; 1845 delete tlist;
2026 } 1846 }
1847
2027 for (lmsg = first_msg; lmsg; lmsg = nextmsg) 1848 for (lmsg = first_msg; lmsg; lmsg = nextmsg)
2028 { 1849 {
2029 nextmsg = lmsg->next; 1850 nextmsg = lmsg->next;
2030 delete lmsg; 1851 delete lmsg;
2031 } 1852 }
1853
2032 for (monlink = first_mon_info; monlink; monlink = nextmon) 1854 for (monlink = first_mon_info; monlink; monlink = nextmon)
2033 { 1855 {
2034 nextmon = monlink->next; 1856 nextmon = monlink->next;
2035 free (monlink); 1857 delete monlink;
2036 } 1858 }
2037} 1859}
2038
2039 1860
2040/***************************************************************************** 1861/*****************************************************************************
2041 * 1862 *
2042 * Writeback routine for updating the bookarchive. 1863 * Writeback routine for updating the bookarchive.
2043 * 1864 *
2044 ****************************************************************************/ 1865 ****************************************************************************/
2045
2046/* write_book_archive() - write out the updated book archive */ 1866/* write_book_archive() - write out the updated book archive */
2047
2048void 1867void
2049write_book_archive (void) 1868write_book_archive (void)
2050{ 1869{
2051 FILE *fp; 1870 FILE *fp;
2052 int index = 0; 1871 int index = 0;
… …
2055 titlelist *bl = get_titlelist (0); 1874 titlelist *bl = get_titlelist (0);
2056 1875
2057 /* If nothing changed, don't write anything */ 1876 /* If nothing changed, don't write anything */
2058 if (!need_to_write_bookarchive) 1877 if (!need_to_write_bookarchive)
2059 return; 1878 return;
1879
2060 need_to_write_bookarchive = 0; 1880 need_to_write_bookarchive = 0;
2061 1881
2062 sprintf (fname, "%s/bookarch", settings.localdir); 1882 sprintf (fname, "%s/bookarch", settings.localdir);
2063 LOG (llevDebug, "Updating book archive: %s...\n", fname); 1883 LOG (llevDebug, "Updating book archive: %s...\n", fname);
2064 1884
2065 if ((fp = fopen (fname, "w")) == NULL) 1885 if ((fp = fopen (fname, "w")) == NULL)
2066 {
2067 LOG (llevDebug, "Can't open book archive file %s\n", fname); 1886 LOG (llevDebug, "Can't open book archive file %s\n", fname);
2068 }
2069 else 1887 else
2070 { 1888 {
2071 while (bl) 1889 while (bl)
2072 { 1890 {
2073 for (book = bl->first_book; book; book = book->next) 1891 for (book = bl->first_book; book; book = book->next)
… …
2080 fprintf (fp, "type %d\n", index); 1898 fprintf (fp, "type %d\n", index);
2081 fprintf (fp, "size %d\n", book->size); 1899 fprintf (fp, "size %d\n", book->size);
2082 fprintf (fp, "index %d\n", book->msg_index); 1900 fprintf (fp, "index %d\n", book->msg_index);
2083 fprintf (fp, "end\n"); 1901 fprintf (fp, "end\n");
2084 } 1902 }
1903
2085 bl = bl->next; 1904 bl = bl->next;
2086 index++; 1905 index++;
2087 } 1906 }
1907
2088 fclose (fp); 1908 fclose (fp);
2089 chmod (fname, SAVE_MODE); 1909 chmod (fname, SAVE_MODE);
2090 } 1910 }
2091} 1911}
1912
2092readable_message_type * 1913readable_message_type *
2093get_readable_message_type (object *readable) 1914get_readable_message_type (object *readable)
2094{ 1915{
2095 uint8 subtype = readable->subtype; 1916 uint8 subtype = readable->subtype;
2096 1917
2097 if (subtype > last_readable_subtype) 1918 if (subtype > last_readable_subtype)
2098 return &(readable_message_types[0]); 1919 return &readable_message_types[0];
1920
2099 return &(readable_message_types[subtype]); 1921 return &readable_message_types[subtype];
2100} 1922}

Diff Legend

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