ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/readable.C
(Generate patch)

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.25 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.34 by root, Tue May 6 16:55:25 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* This file contains code relevant to the BOOKS hack -- designed 24/* This file contains code relevant to the BOOKS hack -- designed
26 * to allow randomly occuring messages in non-magical texts. 25 * to allow randomly occuring messages in non-magical texts.
27 */ 26 */
435 * Be careful to keep the order. If you add readable subtype, add them 434 * Be careful to keep the order. If you add readable subtype, add them
436 * at the bottom of the list. Never delete a subtype because index is used as 435 * at the bottom of the list. Never delete a subtype because index is used as
437 * subtype paramater in arch files! 436 * subtype paramater in arch files!
438 */ 437 */
439static readable_message_type readable_message_types[] = { 438static readable_message_type readable_message_types[] = {
440 /*subtype 0 */ {0, 0}, 439 /*subtype 0 */ {0, 0, "info"},
441 /* book messages subtypes */ 440 /* book messages subtypes */
442 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1}, 441 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1, "readable-book-clasp-1"},
443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2}, 442 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2, "readable-book-clasp-2"},
444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1}, 443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1, "readable-book-elegant-1"},
445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2}, 444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2, "readable-book-elegant-2"},
446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1}, 445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1, "readable-book-quarto-1"},
447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2}, 446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2, "readable-book-quarto-2"},
448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER}, 447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER, "readable-book-spell-evocation"},
449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER}, 448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER, "readable-book-spell-praying"},
450 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO}, 449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO, "readable-book-spell-pyromancy"},
451 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER}, 450 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER, "readable-book-spell-sorcery"},
452 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER}, 451 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER, "readable-book-spell-summoning"},
453 /* card messages subtypes */ 452 /* card messages subtypes */
454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1}, 453 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1, "readable-card-simple-1"},
455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2}, 454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2, "readable-card-simple-2"},
456 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3}, 455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3, "readable-card-simple-3"},
457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1}, 456 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1, "readable-card-elegant-1"},
458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2}, 457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2, "readable-card-elegant-2"},
459 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3}, 458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3, "readable-card-elegant-3"},
460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1}, 459 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1, "readable-card-strange-1"},
461 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2}, 460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2, "readable-card-strange-2"},
462 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3}, 461 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3, "readable-card-strange-3"},
463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1}, 462 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1, "readable-card-money-1"},
464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2}, 463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2, "readable-card-money-2"},
465 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3}, 464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3, "readable-card-money-3"},
466 465
467 /* Paper messages subtypes */ 466 /* Paper messages subtypes */
468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1}, 467 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1, "readable-paper-note-1"},
469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2}, 468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2, "readable-paper-note-2"},
470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3}, 469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3, "readable-paper-note-3"},
471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1}, 470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1, "readable-paper-letter-old-1"},
472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2}, 471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2, "readable-paper-letter-old-2"},
473 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1}, 472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1, "readable-paper-letter-new-1"},
474 /*subtype 30 */ {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_2}, 473 /*subtype 30 */ {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_2, "readable-paper-letter-new-2"},
475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1}, 474 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1, "readable-paper-envelope-1"},
476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2}, 475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2, "readable-paper-envelope-2"},
477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1}, 476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1, "readable-paper-scroll-old-1"},
478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2}, 477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2, "readable-paper-scroll-old-2"},
479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1}, 478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1, "readable-paper-scroll-new-1"},
480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2}, 479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2, "readable-paper-scroll-new-2"},
481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC}, 480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC, "readable-paper-scroll-magic"},
482 481
483 /* road signs messages subtypes */ 482 /* road signs messages subtypes */
484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC}, 483 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC, "readable-sign-basic"},
485 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT}, 484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT, "readable-sign-dir-left"},
486 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT}, 485 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT, "readable-sign-dir-right"},
487 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH}, 486 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH, "readable-sign-dir-both"},
488 487
489 /* stones and monument messages */ 488 /* stones and monument messages */
490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1}, 489 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1, "readable-monument-stone-1"},
491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2}, 490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2, "readable-monument-stone-2"},
492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3}, 491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3, "readable-monument-stone-3"},
493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1}, 492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1, "readable-monument-statue-1"},
494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2}, 493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2, "readable-monument-statue-2"},
495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3}, 494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3, "readable-monument-statue-3"},
496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1}, 495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1, "readable-monument-gravestone-1"},
497 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2}, 496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2, "readable-monument-gravestone-2"},
498 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3}, 497 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"},
499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1}, 498 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2}, 499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3} 500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
502}; 501};
503int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 502int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
504 503
505static int max_titles[6] = { 504static int max_titles[6] = {
506 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)), 505 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)),
748 if (did_init_mon_info) 747 if (did_init_mon_info)
749 return; 748 return;
750 749
751 did_init_mon_info = 1; 750 did_init_mon_info = 1;
752 751
753 752 for_all_archetypes (at)
754 for (at = first_archetype; at != NULL; at = at->next)
755 { 753 {
756 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)))
757 { 755 {
758 objectlink *mon = new objectlink; 756 objectlink *mon = new objectlink;
759 757
760 mon->ob = &at->clone; 758 mon->ob = at;
761 mon->next = first_mon_info; 759 mon->next = first_mon_info;
762 first_mon_info = mon; 760 first_mon_info = mon;
763 nrofmon++; 761 nrofmon++;
764 } 762 }
765 } 763 }
969 t = get_empty_book (); 967 t = get_empty_book ();
970 t->name = book->name; 968 t->name = book->name;
971 t->authour = book->title; 969 t->authour = book->title;
972 t->size = strlen (book->msg); 970 t->size = strlen (book->msg);
973 t->msg_index = strtoint (book->msg); 971 t->msg_index = strtoint (book->msg);
974 t->archname = book->arch->name; 972 t->archname = book->arch->archname;
975 t->level = book->level; 973 t->level = book->level;
976 974
977 t->next = tl->first_book; 975 t->next = tl->first_book;
978 tl->first_book = t; 976 tl->first_book = t;
979 tl->number++; 977 tl->number++;
1442 if (path == -1) 1440 if (path == -1)
1443 strcat (retbuf, "having no known spell path.\n"); 1441 strcat (retbuf, "having no known spell path.\n");
1444 else 1442 else
1445 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]);
1446 1444
1447 for (at = first_archetype; at != NULL; at = at->next) 1445 for_all_archetypes (at)
1448 { 1446 {
1449 /* Determine if this is an appropriate spell. Must 1447 /* Determine if this is an appropriate spell. Must
1450 * be of matching path, must be of appropriate type (prayer 1448 * be of matching path, must be of appropriate type (prayer
1451 * or not), and must be within the valid level range. 1449 * or not), and must be within the valid level range.
1452 */ 1450 */
1453 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1451 if (at->type == SPELL && at->path_attuned & pnum &&
1454 ((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)))
1455 { 1453 {
1456 assign (tmpbuf, at->clone.name); 1454 assign (tmpbuf, at->object::name);
1457 1455
1458 if (book_overflow (retbuf, tmpbuf, booksize)) 1456 if (book_overflow (retbuf, tmpbuf, booksize))
1459 break; 1457 break;
1460 else 1458 else
1461 { 1459 {
1535 1533
1536 /* preamble */ 1534 /* preamble */
1537 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");
1538 1536
1539 if ((at = archetype::find (op_name)) != (archetype *) NULL) 1537 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1540 op_name = at->clone.name; 1538 op_name = at->object::name;
1541 else 1539 else
1542 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);
1543 1541
1544 /* item name */ 1542 /* item name */
1545 if (strcmp (formula->title, "NONE")) 1543 if (strcmp (formula->title, "NONE"))
1555 } 1553 }
1556 else 1554 else
1557 { 1555 {
1558 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1556 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1559 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);
1560 if (at->clone.title) 1558 if (at->title)
1561 { 1559 {
1562 strcat (retbuf, " "); 1560 strcat (retbuf, " ");
1563 strcat (retbuf, at->clone.title); 1561 strcat (retbuf, at->title);
1564 strcat (title, " "); 1562 strcat (title, " ");
1565 strcat (title, at->clone.title); 1563 strcat (title, at->title);
1566 } 1564 }
1567 } 1565 }
1568 /* Lets name the book something meaningful ! */ 1566 /* Lets name the book something meaningful ! */
1569 book->name = title; 1567 book->name = title;
1570 book->title = NULL; 1568 book->title = NULL;
1576 archetype *at; 1574 archetype *at;
1577 1575
1578 at = archetype::find (formula->cauldron); 1576 at = archetype::find (formula->cauldron);
1579 1577
1580 sprintf (retbuf + strlen (retbuf), 1578 sprintf (retbuf + strlen (retbuf),
1581 " 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");
1582 1580
1583 for (next = formula->ingred; next != NULL; next = next->next) 1581 for (next = formula->ingred; next != NULL; next = next->next)
1584 { 1582 {
1585 strcat (retbuf, next->name); 1583 strcat (retbuf, next->name);
1586 strcat (retbuf, "\n"); 1584 strcat (retbuf, "\n");
1593 1591
1594 book->msg = retbuf; 1592 book->msg = retbuf;
1595 } 1593 }
1596} 1594}
1597 1595
1596#define DESCRIBE_PATH(retbuf, variable, name) \
1597 if(variable) { \
1598 int i,j=0; \
1599 strcat(retbuf,"(" name ": "); \
1600 for(i=0; i<NRSPELLPATHS; i++) \
1601 if(variable & (1<<i)) { \
1602 if (j) \
1603 strcat(retbuf,", "); \
1604 else \
1605 j = 1; \
1606 strcat(retbuf, spellpathnames[i]); \
1607 } \
1608 strcat(retbuf,")"); \
1609 }
1610
1598/* god_info_msg() - generate a message detailing the properties 1611/* god_info_msg() - generate a message detailing the properties
1599 * of a random god. Used by the book hack. b.t. 1612 * of a random god. Used by the book hack. b.t.
1600 */ 1613 */
1601const char * 1614const char *
1602god_info_msg (int level, int booksize) 1615god_info_msg (int level, int booksize)
1630 1643
1631 /* Information about the god is random, and based on the level of the 1644 /* Information about the god is random, and based on the level of the
1632 * 'book'. Probably there is a more intellegent way to implement 1645 * 'book'. Probably there is a more intellegent way to implement
1633 * this ... 1646 * this ...
1634 */ 1647 */
1635
1636 while (level > 0) 1648 while (level > 0)
1637 { 1649 {
1638 sprintf (buf, " "); 1650 sprintf (buf, " ");
1639 if (level == 2 && RANDOM () % 2) 1651 if (level == 2 && RANDOM () % 2)
1640 { /* enemy god */ 1652 { /* enemy god */
1844 * 2) make sure there is an entry in max_titles[] array. 1856 * 2) make sure there is an entry in max_titles[] array.
1845 * 3) make sure there are entries for your case in new_text_title() 1857 * 3) make sure there are entries for your case in new_text_title()
1846 * and add_authour(). 1858 * and add_authour().
1847 * 4) you may want separate authour/book name arrays in read.h 1859 * 4) you may want separate authour/book name arrays in read.h
1848 */ 1860 */
1849
1850 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1861 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 8);
1851 switch (msg_type) 1862 switch (msg_type)
1852 { 1863 {
1853 case 1: /* monster attrib */ 1864 case 1: /* monster attrib */
1854 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1865 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1855 break; 1866 break;
1984get_readable_message_type (object *readable) 1995get_readable_message_type (object *readable)
1985{ 1996{
1986 uint8 subtype = readable->subtype; 1997 uint8 subtype = readable->subtype;
1987 1998
1988 if (subtype > last_readable_subtype) 1999 if (subtype > last_readable_subtype)
1989 return &(readable_message_types[0]); 2000 return &readable_message_types[0];
2001
1990 return &(readable_message_types[subtype]); 2002 return &readable_message_types[subtype];
1991} 2003}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines