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

Diff Legend

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