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.24 by root, Thu May 24 03:33:28 2007 UTC vs.
Revision 1.40 by root, Thu Jan 1 11:41:17 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net>
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 *)),
… …
749 if (did_init_mon_info) 747 if (did_init_mon_info)
750 return; 748 return;
751 749
752 did_init_mon_info = 1; 750 did_init_mon_info = 1;
753 751
754 752 for_all_archetypes (at)
755 for (at = first_archetype; at != NULL; at = at->next)
756 { 753 {
757 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)))
758 { 755 {
759 objectlink *mon = new objectlink; 756 objectlink *mon = new objectlink;
760 757
761 mon->ob = &at->clone; 758 mon->ob = at;
762 mon->next = first_mon_info; 759 mon->next = first_mon_info;
763 first_mon_info = mon; 760 first_mon_info = mon;
764 nrofmon++; 761 nrofmon++;
765 } 762 }
766 } 763 }
… …
935 */ 932 */
936 933
937static int 934static int
938unique_book (const object *book, int msgtype) 935unique_book (const object *book, int msgtype)
939{ 936{
940 title *test;
941
942 if (!booklist) 937 if (!booklist)
943 return 1; /* No archival entries! Must be unique! */ 938 return 1; /* No archival entries! Must be unique! */
944 939
945 /* Go through the booklist. If the author and name match, not unique so 940 /* Go through the booklist. If the author and name match, not unique so
946 * return 0. 941 * return 0.
947 */ 942 */
948 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 943 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
949 {
950 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 944 if (test->name == book->name && book->title == test->authour)
951 return 0; 945 return 0;
952 } 946
953 return 1; 947 return 1;
954} 948}
955 949
956/* add_book_to_list() */ 950/* add_book_to_list() */
957 951
… …
970 t = get_empty_book (); 964 t = get_empty_book ();
971 t->name = book->name; 965 t->name = book->name;
972 t->authour = book->title; 966 t->authour = book->title;
973 t->size = strlen (book->msg); 967 t->size = strlen (book->msg);
974 t->msg_index = strtoint (book->msg); 968 t->msg_index = strtoint (book->msg);
975 t->archname = book->arch->name; 969 t->archname = book->arch->archname;
976 t->level = book->level; 970 t->level = book->level;
977 971
978 t->next = tl->first_book; 972 t->next = tl->first_book;
979 tl->first_book = t; 973 tl->first_book = t;
980 tl->number++; 974 tl->number++;
… …
1004{ 998{
1005 int nbr = sizeof (book_descrpt) / sizeof (char *); 999 int nbr = sizeof (book_descrpt) / sizeof (char *);
1006 1000
1007 switch (book->type) 1001 switch (book->type)
1008 { 1002 {
1009 case BOOK: 1003 case BOOK:
1010 { 1004 {
1011 titlelist *tl = get_titlelist (msgtype); 1005 titlelist *tl = get_titlelist (msgtype);
1012 title *t = NULL; 1006 title *t = NULL;
1013 int tries = 0; 1007 int tries = 0;
1014 1008
1015 /* look to see if our msg already been archived. If so, alter 1009 /* look to see if our msg already been archived. If so, alter
1016 * the book to match the archival text. If we fail to match, 1010 * the book to match the archival text. If we fail to match,
1017 * then we archive the new title/name/msg combo if there is 1011 * then we archive the new title/name/msg combo if there is
1018 * room on the titlelist. 1012 * room on the titlelist.
1019 */ 1013 */
1020 1014
1021 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1015 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1022 { 1016 {
1023 object *tmpbook;
1024
1025 /* alter book properties */ 1017 /* alter book properties */
1026 if ((tmpbook = get_archetype (t->archname)) != NULL) 1018 if (object *tmpbook = get_archetype (t->archname))
1019 {
1020 tmpbook->msg = book->msg;
1021 tmpbook->copy_to (book);
1022 tmpbook->destroy ();
1023 }
1024
1025 book->title = t->authour;
1026 book->name = t->name;
1027 book->level = t->level;
1028 }
1029 /* Don't have any default title, so lets make up a new one */
1030 else
1031 {
1032 int numb, maxnames = max_titles[msgtype];
1033 const char *old_title;
1034 const char *old_name;
1035
1036 old_title = book->title;
1037 old_name = book->name;
1038
1039 /* some pre-generated books have title already set (from
1040 * maps), also don't bother looking for unique title if
1041 * we already used up all the available names! */
1042
1043 if (!tl)
1044 {
1045 LOG (llevError, "change_book_name(): can't find title list\n");
1046 numb = 0;
1047 }
1048 else
1049 numb = tl->number;
1050
1051 if (numb == maxnames)
1052 {
1053#ifdef ARCHIVE_DEBUG
1054 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1055#endif
1056 break;
1057 }
1058 /* shouldnt change map-maker books */
1059 else if (!book->title)
1060 do
1027 { 1061 {
1028 tmpbook->msg = book->msg; 1062 /* random book name */
1029 tmpbook->copy_to (book); 1063 new_text_name (book, msgtype);
1030 tmpbook->destroy (); 1064 add_author (book, msgtype); /* random author */
1065 tries++;
1031 } 1066 }
1067 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1032 1068
1033 book->title = t->authour; 1069 /* Now deal with 2 cases.
1034 book->name = t->name; 1070 * 1)If no space for a new title exists lets just restore
1035 book->level = t->level; 1071 * the old book properties. Remember, if the book had
1072 * matchd an older entry on the titlelist, we shouldnt
1073 * have called this routine in the first place!
1074 * 2) If we got a unique title, we need to add it to
1075 * the list.
1036 } 1076 */
1037 /* Don't have any default title, so lets make up a new one */
1038 else
1039 {
1040 int numb, maxnames = max_titles[msgtype];
1041 const char *old_title;
1042 const char *old_name;
1043 1077
1044 old_title = book->title; 1078 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1045 old_name = book->name; 1079 { /* got to check maxnames again */
1046
1047 /* some pre-generated books have title already set (from
1048 * maps), also don't bother looking for unique title if
1049 * we already used up all the available names! */
1050
1051 if (!tl)
1052 {
1053 LOG (llevError, "change_book_name(): can't find title list\n");
1054 numb = 0;
1055 }
1056 else
1057 numb = tl->number;
1058
1059 if (numb == maxnames)
1060 {
1061#ifdef ARCHIVE_DEBUG 1080#ifdef ARCHIVE_DEBUG
1062 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1081 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1063#endif 1082#endif
1064 break; 1083 /* restore old book properties here */
1065 } 1084 book->title = old_title;
1066 /* shouldnt change map-maker books */ 1085
1067 else if (!book->title) 1086 if (rndm (4))
1068 do
1069 { 1087 {
1070 /* random book name */ 1088 /* Lets give the book a description to individualize it some */
1071 new_text_name (book, msgtype); 1089 char new_name[MAX_BUF];
1072 add_author (book, msgtype); /* random author */ 1090
1073 tries++; 1091 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1092
1093 book->name = new_name;
1074 } 1094 }
1075 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1076
1077 /* Now deal with 2 cases.
1078 * 1)If no space for a new title exists lets just restore
1079 * the old book properties. Remember, if the book had
1080 * matchd an older entry on the titlelist, we shouldnt
1081 * have called this routine in the first place!
1082 * 2) If we got a unique title, we need to add it to
1083 * the list.
1084 */
1085
1086 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1087 { /* got to check maxnames again */
1088#ifdef ARCHIVE_DEBUG
1089 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1090#endif
1091 /* restore old book properties here */
1092 book->title = old_title;
1093
1094 if (RANDOM () % 4)
1095 {
1096 /* Lets give the book a description to individualize it some */
1097 char new_name[MAX_BUF];
1098
1099 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1100
1101 book->name = new_name;
1102 }
1103 else 1095 else
1104 { 1096 {
1105 book->name = old_name; 1097 book->name = old_name;
1106 } 1098 }
1107 } 1099 }
1108 else if (book->title && strlen (book->msg) > 5) 1100 else if (book->title && strlen (book->msg) > 5)
1109 { /* archive if long msg texts */ 1101 { /* archive if long msg texts */
1110 add_book_to_list (book, msgtype); 1102 add_book_to_list (book, msgtype);
1111 } 1103 }
1112 } 1104 }
1113 break; 1105 break;
1114 } 1106 }
1115 1107
1116 default: 1108 default:
1117 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1109 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1118 return; 1110 return;
1119 } 1111 }
1120} 1112}
1121 1113
1122/***************************************************************************** 1114/*****************************************************************************
1123 * 1115 *
… …
1148 return (object *) NULL; 1140 return (object *) NULL;
1149 1141
1150 if (!level) 1142 if (!level)
1151 { 1143 {
1152 /* lets get a random monster from the mon_info linked list */ 1144 /* lets get a random monster from the mon_info linked list */
1153 monnr = RANDOM () % nrofmon; 1145 monnr = rndm (nrofmon);
1154 1146
1155 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1147 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1156 if (i++ == monnr) 1148 if (i++ == monnr)
1157 break; 1149 break;
1158 1150
… …
1185 { 1177 {
1186 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level); 1178 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
1187 return NULL; 1179 return NULL;
1188 } 1180 }
1189 1181
1190 monnr = RANDOM () % i; 1182 monnr = rndm (i);
1191 for (mon = first_mon_info; mon; mon = mon->next) 1183 for (mon = first_mon_info; mon; mon = mon->next)
1192 if (mon->ob->level >= level && monnr-- == 0) 1184 if (mon->ob->level >= level && monnr-- == 0)
1193 return mon->ob; 1185 return mon->ob;
1194 1186
1195 if (!mon) 1187 if (!mon)
… …
1299artifact_msg (int level, int booksize) 1291artifact_msg (int level, int booksize)
1300{ 1292{
1301 artifactlist *al = NULL; 1293 artifactlist *al = NULL;
1302 artifact *art; 1294 artifact *art;
1303 int chance, i, type, index; 1295 int chance, i, type, index;
1304 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1296 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1305 const char *ch; 1297 const char *ch;
1306 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1298 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1307 static char retbuf[BOOK_BUF]; 1299 static char retbuf[BOOK_BUF];
1308 object *tmp = NULL; 1300 object *tmp = NULL;
1309 1301
… …
1317 * for that type exists! 1309 * for that type exists!
1318 */ 1310 */
1319 i = 0; 1311 i = 0;
1320 do 1312 do
1321 { 1313 {
1322 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1314 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1323 type = art_name_array[index].type; 1315 type = art_name_array[index].type;
1324 al = find_artifactlist (type); 1316 al = find_artifactlist (type);
1325 i++; 1317 i++;
1326 } 1318 }
1327 while ((al == NULL) && (i < 10)); 1319 while ((al == NULL) && (i < 10));
… …
1330 return "None"; 1322 return "None";
1331 1323
1332 /* There is no reason to start on the artifact list at the begining. Lets 1324 /* There is no reason to start on the artifact list at the begining. Lets
1333 * take our starting position randomly... */ 1325 * take our starting position randomly... */
1334 art = al->items; 1326 art = al->items;
1335 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1327 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1336 { 1328 {
1337 if (art == NULL) 1329 if (!art)
1338 art = al->items; /* hmm, out of stuff, loop back around */ 1330 art = al->items; /* hmm, out of stuff, loop back around */
1331
1339 art = art->next; 1332 art = art->next;
1340 } 1333 }
1341 1334
1342 /* the base 'generic' name for our artifact */ 1335 /* the base 'generic' name for our artifact */
1343 assign (name, art_name_array[index].name); 1336 assign (name, art_name_array[index].name);
… …
1356 1349
1357 /* separator of items */ 1350 /* separator of items */
1358 strcpy (buf, "--- \n"); 1351 strcpy (buf, "--- \n");
1359 1352
1360 /* Name */ 1353 /* Name */
1361 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1354 if (art->allowed && art->allowed->name != shstr_All)
1362 { 1355 {
1363 linked_char *temp, *next = art->allowed; 1356 linked_char *temp, *next = art->allowed;
1364 1357
1365 do 1358 do
1366 { 1359 {
1367 temp = next; 1360 temp = next;
1368 next = next->next; 1361 next = next->next;
1369 } 1362 }
1370 while (next && !RANDOM () % 2); 1363 while (next && rndm (2));
1371 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1364 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name);
1372 } 1365 }
1373 else /* default name is used */ 1366 else /* default name is used */
1374 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1367 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name);
1375 1368
… …
1388 /* value of artifact */ 1381 /* value of artifact */
1389 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1382 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value);
1390 1383
1391 /* include the message about the artifact, if exists, and book 1384 /* include the message about the artifact, if exists, and book
1392 * level is kinda high */ 1385 * level is kinda high */
1393 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1386 if (art->item->msg
1387 && rndm (4) + 1 < level
1388 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
1394 strcat (buf, art->item->msg); 1389 strcat (buf, art->item->msg);
1395 1390
1396 /* properties of the artifact */ 1391 /* properties of the artifact */
1397 tmp = object::create (); 1392 tmp = object::create ();
1398 add_abilities (tmp, art->item); 1393 add_abilities (tmp, art->item);
… …
1430char * 1425char *
1431spellpath_msg (int level, int booksize) 1426spellpath_msg (int level, int booksize)
1432{ 1427{
1433 static char retbuf[BOOK_BUF]; 1428 static char retbuf[BOOK_BUF];
1434 char tmpbuf[BOOK_BUF]; 1429 char tmpbuf[BOOK_BUF];
1435 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1430 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1436 int did_first_sp = 0; 1431 int did_first_sp = 0;
1437 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1432 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1438 archetype *at; 1433 archetype *at;
1439 1434
1440 /* Preamble */ 1435 /* Preamble */
… …
1443 if (path == -1) 1438 if (path == -1)
1444 strcat (retbuf, "having no known spell path.\n"); 1439 strcat (retbuf, "having no known spell path.\n");
1445 else 1440 else
1446 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1441 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]);
1447 1442
1448 for (at = first_archetype; at != NULL; at = at->next) 1443 for_all_archetypes (at)
1449 { 1444 {
1450 /* Determine if this is an appropriate spell. Must 1445 /* Determine if this is an appropriate spell. Must
1451 * be of matching path, must be of appropriate type (prayer 1446 * be of matching path, must be of appropriate type (prayer
1452 * or not), and must be within the valid level range. 1447 * or not), and must be within the valid level range.
1453 */ 1448 */
1454 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1449 if (at->type == SPELL && at->path_attuned & pnum &&
1455 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8))) 1450 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1456 { 1451 {
1457 assign (tmpbuf, at->clone.name); 1452 assign (tmpbuf, at->object::name);
1458 1453
1459 if (book_overflow (retbuf, tmpbuf, booksize)) 1454 if (book_overflow (retbuf, tmpbuf, booksize))
1460 break; 1455 break;
1461 else 1456 else
1462 { 1457 {
… …
1468 } 1463 }
1469 } 1464 }
1470 /* Geez, no spells were generated. */ 1465 /* Geez, no spells were generated. */
1471 if (!did_first_sp) 1466 if (!did_first_sp)
1472 { 1467 {
1473 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1468 if (rndm (4)) /* usually, lets make a recursive call... */
1474 spellpath_msg (level, booksize); 1469 spellpath_msg (level, booksize);
1475 else /* give up, cause knowing no spells exist for path is info too. */ 1470 else /* give up, cause knowing no spells exist for path is info too. */
1476 strcat (retbuf, "\n - no known spells exist -\n"); 1471 strcat (retbuf, "\n - no known spells exist -\n");
1477 } 1472 }
1478 else 1473 else
… …
1494 int chance; 1489 int chance;
1495 1490
1496 /* the higher the book level, the more complex (ie number of 1491 /* the higher the book level, the more complex (ie number of
1497 * ingredients) the formula can be. 1492 * ingredients) the formula can be.
1498 */ 1493 */
1499 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1494 fl = get_formulalist (rndm (level) / 3 + 1);
1500 1495
1501 if (!fl) 1496 if (!fl)
1502 fl = get_formulalist (1); /* safety */ 1497 fl = get_formulalist (1); /* safety */
1503 1498
1504 if (fl->total_chance == 0) 1499 if (fl->total_chance == 0)
… …
1508 add_author (book, 4); 1503 add_author (book, 4);
1509 return; 1504 return;
1510 } 1505 }
1511 1506
1512 /* get a random formula, weighted by its bookchance */ 1507 /* get a random formula, weighted by its bookchance */
1513 chance = RANDOM () % fl->total_chance; 1508 chance = rndm (fl->total_chance);
1514 for (formula = fl->items; formula != NULL; formula = formula->next) 1509 for (formula = fl->items; formula; formula = formula->next)
1515 { 1510 {
1516 chance -= formula->chance; 1511 chance -= formula->chance;
1517 if (chance <= 0) 1512 if (chance <= 0)
1518 break; 1513 break;
1519 } 1514 }
… …
1529 { 1524 {
1530 /* looks like a formula was found. Base the amount 1525 /* looks like a formula was found. Base the amount
1531 * of information on the booklevel and the spellevel 1526 * of information on the booklevel and the spellevel
1532 * of the formula. */ 1527 * of the formula. */
1533 1528
1534 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1529 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1535 archetype *at; 1530 archetype *at;
1536 1531
1537 /* preamble */ 1532 /* preamble */
1538 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1533 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1539 1534
1540 if ((at = archetype::find (op_name)) != (archetype *) NULL) 1535 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1541 op_name = at->clone.name; 1536 op_name = at->object::name;
1542 else 1537 else
1543 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1538 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1544 1539
1545 /* item name */ 1540 /* item name */
1546 if (strcmp (formula->title, "NONE")) 1541 if (formula->title != shstr_NONE)
1547 { 1542 {
1548 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title); 1543 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1549 /* This results in things like pile of philo. sulfur. 1544 /* This results in things like pile of philo. sulfur.
1550 * while philo. sulfur may look better, without this, 1545 * while philo. sulfur may look better, without this,
1551 * you get things like 'the wise' because its missing the 1546 * you get things like 'the wise' because its missing the
1552 * water of section. 1547 * water of section.
1553 */ 1548 */
1554 sprintf (title, "%s: %s of %s", 1549 sprintf (title, "%s: %s of %s",
1555 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title); 1550 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1556 } 1551 }
1557 else 1552 else
1558 { 1553 {
1559 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1554 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1560 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1555 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1561 if (at->clone.title) 1556 if (at->title)
1562 { 1557 {
1563 strcat (retbuf, " "); 1558 strcat (retbuf, " ");
1564 strcat (retbuf, at->clone.title); 1559 strcat (retbuf, at->title);
1565 strcat (title, " "); 1560 strcat (title, " ");
1566 strcat (title, at->clone.title); 1561 strcat (title, at->title);
1567 } 1562 }
1568 } 1563 }
1564
1569 /* Lets name the book something meaningful ! */ 1565 /* Lets name the book something meaningful ! */
1570 book->name = title; 1566 book->name = title;
1571 book->title = NULL; 1567 book->title = NULL;
1572 1568
1573 /* ingredients to make it */ 1569 /* ingredients to make it */
… …
1577 archetype *at; 1573 archetype *at;
1578 1574
1579 at = archetype::find (formula->cauldron); 1575 at = archetype::find (formula->cauldron);
1580 1576
1581 sprintf (retbuf + strlen (retbuf), 1577 sprintf (retbuf + strlen (retbuf),
1582 " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place"); 1578 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place");
1583 1579
1584 for (next = formula->ingred; next != NULL; next = next->next) 1580 for (next = formula->ingred; next != NULL; next = next->next)
1585 { 1581 {
1586 strcat (retbuf, next->name); 1582 strcat (retbuf, next->name);
1587 strcat (retbuf, "\n"); 1583 strcat (retbuf, "\n");
… …
1593 strcat (retbuf, "\n"); 1589 strcat (retbuf, "\n");
1594 1590
1595 book->msg = retbuf; 1591 book->msg = retbuf;
1596 } 1592 }
1597} 1593}
1594
1595#define DESCRIBE_PATH(retbuf, variable, name) \
1596 if(variable) { \
1597 int i,j=0; \
1598 strcat(retbuf,"(" name ": "); \
1599 for(i=0; i<NRSPELLPATHS; i++) \
1600 if(variable & (1<<i)) { \
1601 if (j) \
1602 strcat(retbuf,", "); \
1603 else \
1604 j = 1; \
1605 strcat(retbuf, spellpathnames[i]); \
1606 } \
1607 strcat(retbuf,")"); \
1608 }
1598 1609
1599/* god_info_msg() - generate a message detailing the properties 1610/* god_info_msg() - generate a message detailing the properties
1600 * of a random god. Used by the book hack. b.t. 1611 * of a random god. Used by the book hack. b.t.
1601 */ 1612 */
1602const char * 1613const char *
… …
1631 1642
1632 /* Information about the god is random, and based on the level of the 1643 /* Information about the god is random, and based on the level of the
1633 * 'book'. Probably there is a more intellegent way to implement 1644 * 'book'. Probably there is a more intellegent way to implement
1634 * this ... 1645 * this ...
1635 */ 1646 */
1636
1637 while (level > 0) 1647 while (level > 0)
1638 { 1648 {
1639 sprintf (buf, " "); 1649 sprintf (buf, " ");
1640 if (level == 2 && RANDOM () % 2) 1650 if (level == 2 && rndm (2))
1641 { /* enemy god */ 1651 { /* enemy god */
1642 const char *enemy = god->title; 1652 const char *enemy = god->title;
1643 1653
1644 if (enemy) 1654 if (enemy)
1645 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1655 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1646 } 1656 }
1647 1657
1648 if (level == 3 && RANDOM () % 2) 1658 if (level == 3 && rndm (2))
1649 { /* enemy race, what the god's holy word effects */ 1659 { /* enemy race, what the god's holy word effects */
1650 const char *enemy = god->slaying; 1660 const char *enemy = god->slaying;
1651 1661
1652 if (enemy && !(god->path_denied & PATH_TURNING)) 1662 if (enemy && !(god->path_denied & PATH_TURNING))
1653 if ((i = nstrtok (enemy, ",")) > 0) 1663 if ((i = nstrtok (enemy, ",")) > 0)
… …
1662 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1672 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1663 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1673 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1664 } 1674 }
1665 } 1675 }
1666 1676
1667 if (level == 4 && RANDOM () % 2) 1677 if (level == 4 && rndm (2))
1668 { /* Priest of god gets these protect,vulnerable... */ 1678 { /* Priest of god gets these protect,vulnerable... */
1669 char tmpbuf[MAX_BUF]; 1679 char tmpbuf[MAX_BUF];
1670 1680
1671 if (const char *cp = describe_resistance (god, 1)) 1681 if (const char *cp = describe_resistance (god, 1))
1672 { /* This god does have protections */ 1682 { /* This god does have protections */
… …
1678 } 1688 }
1679 else 1689 else
1680 sprintf (buf, " "); 1690 sprintf (buf, " ");
1681 } 1691 }
1682 1692
1683 if (level == 5 && RANDOM () % 2) 1693 if (level == 5 && rndm (2))
1684 { /* aligned race, summoning */ 1694 { /* aligned race, summoning */
1685 const char *race = god->race; /* aligned race */ 1695 const char *race = god->race; /* aligned race */
1686 1696
1687 if (race && !(god->path_denied & PATH_SUMMON)) 1697 if (race && !(god->path_denied & PATH_SUMMON))
1688 if ((i = nstrtok (race, ",")) > 0) 1698 if ((i = nstrtok (race, ",")) > 0)
… …
1696 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1706 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1697 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1707 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1698 } 1708 }
1699 } 1709 }
1700 1710
1701 if (level == 6 && RANDOM () % 2) 1711 if (level == 6 && rndm (2))
1702 { /* blessing,curse properties of the god */ 1712 { /* blessing,curse properties of the god */
1703 char tmpbuf[MAX_BUF]; 1713 char tmpbuf[MAX_BUF];
1704 1714
1705 if (const char *cp = describe_resistance (god, 1)) 1715 if (const char *cp = describe_resistance (god, 1))
1706 { /* This god does have protections */ 1716 { /* This god does have protections */
… …
1713 else 1723 else
1714 sprintf (buf, " "); 1724 sprintf (buf, " ");
1715 1725
1716 } 1726 }
1717 1727
1718 if (level == 8 && RANDOM () % 2) 1728 if (level == 8 && rndm (2))
1719 { /* immunity, holy possession */ 1729 { /* immunity, holy possession */
1720 int has_effect = 0, tmpvar; 1730 int has_effect = 0, tmpvar;
1721 char tmpbuf[MAX_BUF]; 1731 char tmpbuf[MAX_BUF];
1722 1732
1723 sprintf (tmpbuf, "\n"); 1733 sprintf (tmpbuf, "\n");
… …
1741 } 1751 }
1742 else 1752 else
1743 sprintf (buf, " "); 1753 sprintf (buf, " ");
1744 } 1754 }
1745 1755
1746 if (level == 12 && RANDOM () % 2) 1756 if (level == 12 && rndm (2))
1747 { /* spell paths */ 1757 { /* spell paths */
1748 int has_effect = 0, tmpvar; 1758 int has_effect = 0, tmpvar;
1749 char tmpbuf[MAX_BUF]; 1759 char tmpbuf[MAX_BUF];
1750 1760
1751 sprintf (tmpbuf, "\n"); 1761 sprintf (tmpbuf, "\n");
… …
1821 */ 1831 */
1822void 1832void
1823tailor_readable_ob (object *book, int msg_type) 1833tailor_readable_ob (object *book, int msg_type)
1824{ 1834{
1825 char msgbuf[BOOK_BUF]; 1835 char msgbuf[BOOK_BUF];
1826 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1836 int level = book->level ? rndm (book->level) + 1 : 1;
1827 int book_buf_size; 1837 int book_buf_size;
1828 1838
1829 /* safety */ 1839 /* safety */
1830 if (book->type != BOOK) 1840 if (book->type != BOOK)
1831 return; 1841 return;
… …
1845 * 2) make sure there is an entry in max_titles[] array. 1855 * 2) make sure there is an entry in max_titles[] array.
1846 * 3) make sure there are entries for your case in new_text_title() 1856 * 3) make sure there are entries for your case in new_text_title()
1847 * and add_authour(). 1857 * and add_authour().
1848 * 4) you may want separate authour/book name arrays in read.h 1858 * 4) you may want separate authour/book name arrays in read.h
1849 */ 1859 */
1850
1851 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1860 msg_type = msg_type > 0 ? msg_type : rndm (8);
1852 switch (msg_type) 1861 switch (msg_type)
1853 { 1862 {
1854 case 1: /* monster attrib */ 1863 case 1: /* monster attrib */
1855 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1864 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1856 break; 1865 break;
… …
1880 { 1889 {
1881 book->msg = msgbuf; 1890 book->msg = msgbuf;
1882 /* lets give the "book" a new name, which may be a compound word */ 1891 /* lets give the "book" a new name, which may be a compound word */
1883 change_book (book, msg_type); 1892 change_book (book, msg_type);
1884 } 1893 }
1885
1886} 1894}
1887 1895
1888 1896
1889/***************************************************************************** 1897/*****************************************************************************
1890 * 1898 *
… …
1985get_readable_message_type (object *readable) 1993get_readable_message_type (object *readable)
1986{ 1994{
1987 uint8 subtype = readable->subtype; 1995 uint8 subtype = readable->subtype;
1988 1996
1989 if (subtype > last_readable_subtype) 1997 if (subtype > last_readable_subtype)
1990 return &(readable_message_types[0]); 1998 return &readable_message_types[0];
1999
1991 return &(readable_message_types[subtype]); 2000 return &readable_message_types[subtype];
1992} 2001}

Diff Legend

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