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.22 by root, Sun Mar 18 03:05:39 2007 UTC vs.
Revision 1.30 by root, Sun Jul 1 05:00:17 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24
25 23
26/* This file contains code relevant to the BOOKS hack -- designed 24/* This file contains code relevant to the BOOKS hack -- designed
27 * to allow randomly occuring messages in non-magical texts. 25 * to allow randomly occuring messages in non-magical texts.
28 */ 26 */
29 27
… …
436 * 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
437 * 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
438 * subtype paramater in arch files! 436 * subtype paramater in arch files!
439 */ 437 */
440static readable_message_type readable_message_types[] = { 438static readable_message_type readable_message_types[] = {
441 /*subtype 0 */ {0, 0}, 439 /*subtype 0 */ {0, 0, "info"},
442 /* book messages subtypes */ 440 /* book messages subtypes */
443 /*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"},
444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2}, 442 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2, "readable-book-clasp-2"},
445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1}, 443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1, "readable-book-elegant-1"},
446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2}, 444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2, "readable-book-elegant-2"},
447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1}, 445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1, "readable-book-quarto-1"},
448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2}, 446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2, "readable-book-quarto-2"},
449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER}, 447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER, "readable-book-spell-evocation"},
450 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER}, 448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER, "readable-book-spell-praying"},
451 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO}, 449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO, "readable-book-spell-pyromancy"},
452 /*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"},
453 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER}, 451 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER, "readable-book-spell-summoning"},
454 /* card messages subtypes */ 452 /* card messages subtypes */
455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1}, 453 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1, "readable-card-simple-1"},
456 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2}, 454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2, "readable-card-simple-2"},
457 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3}, 455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3, "readable-card-simple-3"},
458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1}, 456 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1, "readable-card-elegant-1"},
459 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2}, 457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2, "readable-card-elegant-2"},
460 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3}, 458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3, "readable-card-elegant-3"},
461 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1}, 459 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1, "readable-card-strange-1"},
462 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2}, 460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2, "readable-card-strange-2"},
463 /*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"},
464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1}, 462 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1, "readable-card-money-1"},
465 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2}, 463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2, "readable-card-money-2"},
466 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3}, 464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3, "readable-card-money-3"},
467 465
468 /* Paper messages subtypes */ 466 /* Paper messages subtypes */
469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1}, 467 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1, "readable-paper-note-1"},
470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2}, 468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2, "readable-paper-note-2"},
471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3}, 469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3, "readable-paper-note-3"},
472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1}, 470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1, "readable-paper-letter-old-1"},
473 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2}, 471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2, "readable-paper-letter-old-2"},
474 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1}, 472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1, "readable-paper-letter-new-1"},
475 /*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"},
476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1}, 474 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1, "readable-paper-envelope-1"},
477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2}, 475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2, "readable-paper-envelope-2"},
478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1}, 476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1, "readable-paper-scroll-old-1"},
479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2}, 477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2, "readable-paper-scroll-old-2"},
480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1}, 478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1, "readable-paper-scroll-new-1"},
481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2}, 479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2, "readable-paper-scroll-new-2"},
482 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC}, 480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC, "readable-paper-scroll-magic"},
483 481
484 /* road signs messages subtypes */ 482 /* road signs messages subtypes */
485 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC}, 483 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC, "readable-sign-basic"},
486 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT}, 484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT, "readable-sign-dir-left"},
487 /*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"},
488 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH}, 486 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH, "readable-sign-dir-both"},
489 487
490 /* stones and monument messages */ 488 /* stones and monument messages */
491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1}, 489 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1, "readable-monument-stone-1"},
492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2}, 490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2, "readable-monument-stone-2"},
493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3}, 491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3, "readable-monument-stone-3"},
494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1}, 492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1, "readable-monument-statue-1"},
495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2}, 493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2, "readable-monument-statue-2"},
496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3}, 494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3, "readable-monument-statue-3"},
497 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1}, 495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1, "readable-monument-gravestone-1"},
498 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2}, 496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2, "readable-monument-gravestone-2"},
499 /*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"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1}, 498 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2}, 499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
502 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3} 500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
503}; 501};
504int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 502int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
505 503
506static int max_titles[6] = { 504static int max_titles[6] = {
507 ((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 *)),
… …
641 * 639 *
642 * Start of initialisation related functions. 640 * Start of initialisation related functions.
643 * 641 *
644 ****************************************************************************/ 642 ****************************************************************************/
645 643
646/* init_msgfile() - if not called before, initialise the info list
647 * reads the messages file into the list pointed to by first_msg
648*/
649
650static void
651init_msgfile (void)
652{
653 FILE *fp;
654 char buf[MAX_BUF], msgbuf[HUGE_BUF], fname[MAX_BUF], *cp;
655 int comp;
656 static int did_init_msgfile;
657
658 if (did_init_msgfile)
659 return;
660 did_init_msgfile = 1;
661
662 sprintf (fname, "%s/messages", settings.datadir);
663 LOG (llevDebug, "Reading messages from %s...\n", fname);
664
665 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
666 {
667 linked_char *tmp = NULL;
668
669 while (fgets (buf, MAX_BUF, fp) != NULL)
670 {
671 if (*buf == '#')
672 continue;
673 if ((cp = strchr (buf, '\n')) != NULL)
674 *cp = '\0';
675 cp = buf;
676 while (*cp == ' ') /* Skip blanks */
677 cp++;
678 if (!strncmp (cp, "ENDMSG", 6))
679 {
680 if (strlen (msgbuf) > BOOK_BUF)
681 {
682 LOG (llevDebug, "Warning: this string exceeded max book buf size:");
683 LOG (llevDebug, " %s\n", msgbuf);
684 }
685 tmp->name = msgbuf;
686 tmp->next = first_msg;
687 first_msg = tmp;
688 nrofmsg++;
689 continue;
690 }
691 else if (!strncmp (cp, "MSG", 3))
692 {
693 tmp = new linked_char;
694
695 strcpy (msgbuf, " "); /* reset msgbuf for new message */
696 continue;
697 }
698 else if (!buf_overflow (msgbuf, cp, HUGE_BUF - 1))
699 {
700 strcat (msgbuf, cp);
701 strcat (msgbuf, "\n");
702 }
703 }
704 close_and_delete (fp, comp);
705 }
706
707#ifdef BOOK_MSG_DEBUG
708 LOG (llevDebug, "init_info_listfile() got %d messages.\n", nrofmsg);
709#endif
710 LOG (llevDebug, "done.\n");
711}
712
713
714/* init_book_archive() - if not called before, initialise the info list 644/* init_book_archive() - if not called before, initialise the info list
715 * This reads in the bookarch file into memory. bookarch is the file 645 * This reads in the bookarch file into memory. bookarch is the file
716 * created and updated across multiple runs of the program. 646 * created and updated across multiple runs of the program.
717 */ 647 */
718
719static void 648static void
720init_book_archive (void) 649init_book_archive (void)
721{ 650{
722 FILE *fp; 651 FILE *fp;
723 int comp, nroftitle = 0; 652 int comp, nroftitle = 0;
… …
818 if (did_init_mon_info) 747 if (did_init_mon_info)
819 return; 748 return;
820 749
821 did_init_mon_info = 1; 750 did_init_mon_info = 1;
822 751
823 752 for_all_archetypes (at)
824 for (at = first_archetype; at != NULL; at = at->next)
825 { 753 {
826 if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE))) 754 if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE)))
827 { 755 {
828 objectlink *mon = new objectlink; 756 objectlink *mon = new objectlink;
829 757
830 mon->ob = &at->clone; 758 mon->ob = at;
831 mon->next = first_mon_info; 759 mon->next = first_mon_info;
832 first_mon_info = mon; 760 first_mon_info = mon;
833 nrofmon++; 761 nrofmon++;
834 } 762 }
835 } 763 }
836 764
837 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 765 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
838} 766}
839
840 767
841/* init_readable() - initialise linked lists utilized by 768/* init_readable() - initialise linked lists utilized by
842 * message functions in tailor_readable_ob() 769 * message functions in tailor_readable_ob()
843 * 770 *
844 * This is the function called by the main routine to initialise 771 * This is the function called by the main routine to initialise
845 * all the readable information. 772 * all the readable information.
846 */ 773 */
847
848void 774void
849init_readable (void) 775init_readable (void)
850{ 776{
851 static int did_this; 777 static int did_this;
852 778
… …
854 return; 780 return;
855 781
856 did_this = 1; 782 did_this = 1;
857 783
858 LOG (llevDebug, "Initialising reading data...\n"); 784 LOG (llevDebug, "Initialising reading data...\n");
859 init_msgfile ();
860 init_book_archive (); 785 init_book_archive ();
861 init_mon_info (); 786 init_mon_info ();
862 LOG (llevDebug, " Done\n"); 787 LOG (llevDebug, " Done\n");
863
864} 788}
865 789
866/***************************************************************************** 790/*****************************************************************************
867 * 791 *
868 * This is the start of the administrative functions when creating 792 * This is the start of the administrative functions when creating
869 * new books (ie, updating title and the like) 793 * new books (ie, updating title and the like)
870 * 794 *
871 *****************************************************************************/ 795 *****************************************************************************/
872 796
873
874/* find_title() - Search the titlelist (based on msgtype) to see if 797/* find_title() - Search the titlelist (based on msgtype) to see if
875 * book matches something already there. IF so, return that title. 798 * book matches something already there. IF so, return that title.
876 */ 799 */
877
878static title * 800static title *
879find_title (const object *book, int msgtype) 801find_title (const object *book, int msgtype)
880{ 802{
881 title *t = NULL; 803 title *t = NULL;
882 titlelist *tl = get_titlelist (msgtype); 804 titlelist *tl = get_titlelist (msgtype);
… …
1045 t = get_empty_book (); 967 t = get_empty_book ();
1046 t->name = book->name; 968 t->name = book->name;
1047 t->authour = book->title; 969 t->authour = book->title;
1048 t->size = strlen (book->msg); 970 t->size = strlen (book->msg);
1049 t->msg_index = strtoint (book->msg); 971 t->msg_index = strtoint (book->msg);
1050 t->archname = book->arch->name; 972 t->archname = book->arch->archname;
1051 t->level = book->level; 973 t->level = book->level;
1052 974
1053 t->next = tl->first_book; 975 t->next = tl->first_book;
1054 tl->first_book = t; 976 tl->first_book = t;
1055 tl->number++; 977 tl->number++;
… …
1518 if (path == -1) 1440 if (path == -1)
1519 strcat (retbuf, "having no known spell path.\n"); 1441 strcat (retbuf, "having no known spell path.\n");
1520 else 1442 else
1521 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1443 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]);
1522 1444
1523 for (at = first_archetype; at != NULL; at = at->next) 1445 for_all_archetypes (at)
1524 { 1446 {
1525 /* Determine if this is an appropriate spell. Must 1447 /* Determine if this is an appropriate spell. Must
1526 * be of matching path, must be of appropriate type (prayer 1448 * be of matching path, must be of appropriate type (prayer
1527 * or not), and must be within the valid level range. 1449 * or not), and must be within the valid level range.
1528 */ 1450 */
1529 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1451 if (at->type == SPELL && at->path_attuned & pnum &&
1530 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8))) 1452 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1531 { 1453 {
1532 assign (tmpbuf, at->clone.name); 1454 assign (tmpbuf, at->object::name);
1533 1455
1534 if (book_overflow (retbuf, tmpbuf, booksize)) 1456 if (book_overflow (retbuf, tmpbuf, booksize))
1535 break; 1457 break;
1536 else 1458 else
1537 { 1459 {
… …
1555 strcat (retbuf, "\n"); 1477 strcat (retbuf, "\n");
1556 } 1478 }
1557 return retbuf; 1479 return retbuf;
1558} 1480}
1559 1481
1560
1561
1562/* formula_msg() - generate a message detailing the properties 1482/* formula_msg() - generate a message detailing the properties
1563 * of a randomly selected alchemical formula. 1483 * of a randomly selected alchemical formula.
1564 */ 1484 */
1565
1566void 1485void
1567make_formula_book (object *book, int level) 1486make_formula_book (object *book, int level)
1568{ 1487{
1569 char retbuf[BOOK_BUF], title[MAX_BUF]; 1488 char retbuf[BOOK_BUF], title[MAX_BUF];
1570 recipelist *fl; 1489 recipelist *fl;
… …
1614 1533
1615 /* preamble */ 1534 /* preamble */
1616 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1535 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1617 1536
1618 if ((at = archetype::find (op_name)) != (archetype *) NULL) 1537 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1619 op_name = at->clone.name; 1538 op_name = at->object::name;
1620 else 1539 else
1621 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1540 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1622 1541
1623 /* item name */ 1542 /* item name */
1624 if (strcmp (formula->title, "NONE")) 1543 if (strcmp (formula->title, "NONE"))
… …
1634 } 1553 }
1635 else 1554 else
1636 { 1555 {
1637 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1556 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1638 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1557 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name);
1639 if (at->clone.title) 1558 if (at->title)
1640 { 1559 {
1641 strcat (retbuf, " "); 1560 strcat (retbuf, " ");
1642 strcat (retbuf, at->clone.title); 1561 strcat (retbuf, at->title);
1643 strcat (title, " "); 1562 strcat (title, " ");
1644 strcat (title, at->clone.title); 1563 strcat (title, at->title);
1645 } 1564 }
1646 } 1565 }
1647 /* Lets name the book something meaningful ! */ 1566 /* Lets name the book something meaningful ! */
1648 book->name = title; 1567 book->name = title;
1649 book->title = NULL; 1568 book->title = NULL;
… …
1655 archetype *at; 1574 archetype *at;
1656 1575
1657 at = archetype::find (formula->cauldron); 1576 at = archetype::find (formula->cauldron);
1658 1577
1659 sprintf (retbuf + strlen (retbuf), 1578 sprintf (retbuf + strlen (retbuf),
1660 " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place"); 1579 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place");
1661 1580
1662 for (next = formula->ingred; next != NULL; next = next->next) 1581 for (next = formula->ingred; next != NULL; next = next->next)
1663 { 1582 {
1664 strcat (retbuf, next->name); 1583 strcat (retbuf, next->name);
1665 strcat (retbuf, "\n"); 1584 strcat (retbuf, "\n");
… …
1670 if (retbuf[strlen (retbuf) - 1] != '\n') 1589 if (retbuf[strlen (retbuf) - 1] != '\n')
1671 strcat (retbuf, "\n"); 1590 strcat (retbuf, "\n");
1672 1591
1673 book->msg = retbuf; 1592 book->msg = retbuf;
1674 } 1593 }
1675}
1676
1677
1678/* msgfile_msg() - generate a message drawn randomly from a
1679 * file in lib/. Level currently has no effect on the message
1680 * which is returned.
1681 */
1682
1683char *
1684msgfile_msg (int level, int booksize)
1685{
1686 static char retbuf[BOOK_BUF];
1687 int i, msgnum;
1688 linked_char *msg = NULL;
1689
1690 /* get a random message for the 'book' from linked list */
1691 if (nrofmsg > 1)
1692 {
1693 msg = first_msg;
1694 msgnum = RANDOM () % nrofmsg;
1695 for (i = 0; msg && i < nrofmsg && i != msgnum; i++)
1696 msg = msg->next;
1697 }
1698
1699 if (msg && !book_overflow (retbuf, msg->name, booksize))
1700 assign (retbuf, msg->name);
1701 else
1702 sprintf (retbuf, "\n <undecipherable text>");
1703
1704#ifdef BOOK_MSG_DEBUG
1705 LOG (llevDebug, "\n info_list_msg() created strng: %d\n", strlen (retbuf));
1706 LOG (llevDebug, " MADE THIS:\n%s\n", retbuf);
1707#endif
1708
1709 return retbuf;
1710} 1594}
1711 1595
1712/* god_info_msg() - generate a message detailing the properties 1596/* god_info_msg() - generate a message detailing the properties
1713 * of a random god. Used by the book hack. b.t. 1597 * of a random god. Used by the book hack. b.t.
1714 */ 1598 */
… …
1930 * book is the object we are creating into. 1814 * book is the object we are creating into.
1931 * If msg_type is a positive value, we use that to determine the 1815 * If msg_type is a positive value, we use that to determine the
1932 * message type - otherwise a random value is used. 1816 * message type - otherwise a random value is used.
1933 * 1817 *
1934 */ 1818 */
1935
1936void 1819void
1937tailor_readable_ob (object *book, int msg_type) 1820tailor_readable_ob (object *book, int msg_type)
1938{ 1821{
1939 char msgbuf[BOOK_BUF]; 1822 char msgbuf[BOOK_BUF];
1940 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1823 int level = book->level ? (RANDOM () % book->level) + 1 : 1;
… …
1963 */ 1846 */
1964 1847
1965 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1848 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6);
1966 switch (msg_type) 1849 switch (msg_type)
1967 { 1850 {
1968 case 1: /* monster attrib */ 1851 case 1: /* monster attrib */
1969 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1852 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1970 break; 1853 break;
1971 case 2: /* artifact attrib */ 1854 case 2: /* artifact attrib */
1972 strcpy (msgbuf, artifact_msg (level, book_buf_size)); 1855 strcpy (msgbuf, artifact_msg (level, book_buf_size));
1973 break; 1856 break;
1974 case 3: /* grouping incantations/prayers by path */ 1857 case 3: /* grouping incantations/prayers by path */
1975 strcpy (msgbuf, spellpath_msg (level, book_buf_size)); 1858 strcpy (msgbuf, spellpath_msg (level, book_buf_size));
1976 break; 1859 break;
1977 case 4: /* describe an alchemy formula */ 1860 case 4: /* describe an alchemy formula */
1978 make_formula_book (book, level); 1861 make_formula_book (book, level);
1979 /* make_formula_book already gives title */ 1862 /* make_formula_book already gives title */
1980 return; 1863 return;
1981 break; 1864 break;
1982 case 5: /* bits of information about a god */ 1865 case 5: /* bits of information about a god */
1983 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1866 strcpy (msgbuf, god_info_msg (level, book_buf_size));
1984 break; 1867 break;
1985 case 0: /* use info list in lib/ */ 1868 case 0: /* use info list in lib/ */
1986 default: 1869 default:
1987 strcpy (msgbuf, msgfile_msg (level, book_buf_size)); 1870 cfperl_make_book (book, level);
1988 break; 1871 return;
1989 } 1872 }
1990 1873
1991 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */ 1874 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1992 1875
1993 if (strlen (msgbuf) > 1) 1876 if (strlen (msgbuf) > 1)
… …
2099get_readable_message_type (object *readable) 1982get_readable_message_type (object *readable)
2100{ 1983{
2101 uint8 subtype = readable->subtype; 1984 uint8 subtype = readable->subtype;
2102 1985
2103 if (subtype > last_readable_subtype) 1986 if (subtype > last_readable_subtype)
2104 return &(readable_message_types[0]); 1987 return &readable_message_types[0];
1988
2105 return &(readable_message_types[subtype]); 1989 return &readable_message_types[subtype];
2106} 1990}

Diff Legend

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