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.33 by root, Thu Nov 8 19:43:23 2007 UTC vs.
Revision 1.46 by root, Thu Oct 15 23:02:28 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 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 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* This file contains code relevant to the BOOKS hack -- designed 25/* This file contains code relevant to the BOOKS hack -- designed
… …
29 30
30#include <global.h> 31#include <global.h>
31#include <book.h> 32#include <book.h>
32#include <living.h> 33#include <living.h>
33#include <spells.h> 34#include <spells.h>
34
35 35
36/* Define this if you want to archive book titles by contents. 36/* Define this if you want to archive book titles by contents.
37 * This option should enforce UNIQUE combinations of titles,authors and 37 * This option should enforce UNIQUE combinations of titles,authors and
38 * msg contents during and *between* game sessions. 38 * msg contents during and *between* game sessions.
39 * 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
… …
569 * (shstr.c ?), but the quantity BOOK_BUF will need to be defined. */ 569 * (shstr.c ?), but the quantity BOOK_BUF will need to be defined. */
570 570
571/* nstrtok() - simple routine to return the number of list 571/* nstrtok() - simple routine to return the number of list
572 * items in buf1 as separated by the value of buf2 572 * items in buf1 as separated by the value of buf2
573 */ 573 */
574 574static int
575int
576nstrtok (const char *buf1, const char *buf2) 575nstrtok (const char *buf1, const char *buf2)
577{ 576{
578 char *tbuf, sbuf[12], buf[MAX_BUF]; 577 char *tbuf, sbuf[12], buf[MAX_BUF];
579 int number = 0; 578 int number = 0;
580 579
… …
593 592
594/* strtoktolin() - takes a string in buf1 and separates it into 593/* strtoktolin() - takes a string in buf1 and separates it into
595 * a list of strings delimited by buf2. Then returns a comma 594 * a list of strings delimited by buf2. Then returns a comma
596 * separated string w/ decent punctuation. 595 * separated string w/ decent punctuation.
597 */ 596 */
598 597static char *
599char *
600strtoktolin (const char *buf1, const char *buf2) 598strtoktolin (const char *buf1, const char *buf2)
601{ 599{
602 int maxi, i = nstrtok (buf1, buf2); 600 int maxi, i = nstrtok (buf1, buf2);
603 char *tbuf, buf[MAX_BUF], sbuf[12]; 601 char *tbuf, buf[MAX_BUF], sbuf[12];
604 static char rbuf[BOOK_BUF]; 602 static char rbuf[BOOK_BUF];
… …
621 tbuf = strtok (NULL, sbuf); 619 tbuf = strtok (NULL, sbuf);
622 } 620 }
623 return (char *) rbuf; 621 return (char *) rbuf;
624} 622}
625 623
626int 624static int
627book_overflow (const char *buf1, const char *buf2, int booksize) 625book_overflow (const char *buf1, const char *buf2, int booksize)
628{ 626{
629
630 if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */ 627 if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */
631 || buf_overflow (buf1, buf2, booksize)) 628 || buf_overflow (buf1, buf2, booksize))
632 return 1; 629 return 1;
630
633 return 0; 631 return 0;
634
635
636} 632}
637 633
638/***************************************************************************** 634/*****************************************************************************
639 * 635 *
640 * Start of initialisation related functions. 636 * Start of initialisation related functions.
… …
817 else 813 else
818 t = t->next; 814 t = t->next;
819 815
820#ifdef ARCHIVE_DEBUG 816#ifdef ARCHIVE_DEBUG
821 if (t) 817 if (t)
822 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, t->name, t->authour, t->msg_index); 818 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, &t->name, &t->authour, t->msg_index);
823#endif 819#endif
824 820
825 return t; 821 return t;
826} 822}
827 823
… …
829 * handled directly in change_book_name(). Names are based on text 825 * handled directly in change_book_name(). Names are based on text
830 * msgtype 826 * msgtype
831 * this sets book book->name based on msgtype given. What name 827 * this sets book book->name based on msgtype given. What name
832 * is given is based on various criteria 828 * is given is based on various criteria
833 */ 829 */
834
835static void 830static void
836new_text_name (object *book, int msgtype) 831new_text_name (object *book, int msgtype)
837{ 832{
838 int nbr; 833 int nbr;
839 char name[MAX_BUF]; 834 char name[MAX_BUF];
… …
932 */ 927 */
933 928
934static int 929static int
935unique_book (const object *book, int msgtype) 930unique_book (const object *book, int msgtype)
936{ 931{
937 title *test;
938
939 if (!booklist) 932 if (!booklist)
940 return 1; /* No archival entries! Must be unique! */ 933 return 1; /* No archival entries! Must be unique! */
941 934
942 /* Go through the booklist. If the author and name match, not unique so 935 /* Go through the booklist. If the author and name match, not unique so
943 * return 0. 936 * return 0.
944 */ 937 */
945 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 938 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
946 {
947 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 939 if (test->name == book->name && book->title == test->authour)
948 return 0; 940 return 0;
949 } 941
950 return 1; 942 return 1;
951} 943}
952 944
953/* add_book_to_list() */ 945/* add_book_to_list() */
954 946
… …
978 970
979 /* We have stuff we need to write now */ 971 /* We have stuff we need to write now */
980 need_to_write_bookarchive = 1; 972 need_to_write_bookarchive = 1;
981 973
982#ifdef ARCHIVE_DEBUG 974#ifdef ARCHIVE_DEBUG
983 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", book->name, book->title, msgtype); 975 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", &book->name, &book->title, msgtype);
984#endif 976#endif
985 977
986} 978}
987 979
988 980
… …
994 * levels and architypes. -b.t. 986 * levels and architypes. -b.t.
995 */ 987 */
996 988
997#define MAX_TITLE_CHECK 20 989#define MAX_TITLE_CHECK 20
998 990
999void 991static void
1000change_book (object *book, int msgtype) 992change_book (object *book, int msgtype)
1001{ 993{
1002 int nbr = sizeof (book_descrpt) / sizeof (char *); 994 int nbr = sizeof (book_descrpt) / sizeof (char *);
1003 995
1004 switch (book->type) 996 switch (book->type)
1005 { 997 {
1006 case BOOK: 998 case BOOK:
1007 { 999 {
1008 titlelist *tl = get_titlelist (msgtype); 1000 titlelist *tl = get_titlelist (msgtype);
1009 title *t = NULL; 1001 title *t = NULL;
1010 int tries = 0; 1002 int tries = 0;
1011 1003
1012 /* look to see if our msg already been archived. If so, alter 1004 /* look to see if our msg already been archived. If so, alter
1013 * the book to match the archival text. If we fail to match, 1005 * the book to match the archival text. If we fail to match,
1014 * then we archive the new title/name/msg combo if there is 1006 * then we archive the new title/name/msg combo if there is
1015 * room on the titlelist. 1007 * room on the titlelist.
1016 */ 1008 */
1017 1009
1018 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1010 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1019 { 1011 {
1020 object *tmpbook;
1021
1022 /* alter book properties */ 1012 /* alter book properties */
1023 if ((tmpbook = get_archetype (t->archname)) != NULL) 1013 if (object *tmpbook = get_archetype (t->archname))
1014 {
1015 tmpbook->msg = book->msg;
1016 tmpbook->copy_to (book);
1017 tmpbook->destroy ();
1018 }
1019
1020 book->title = t->authour;
1021 book->name = t->name;
1022 book->level = t->level;
1023 }
1024 /* Don't have any default title, so lets make up a new one */
1025 else
1026 {
1027 int numb, maxnames = max_titles[msgtype];
1028 const char *old_title;
1029 const char *old_name;
1030
1031 old_title = book->title;
1032 old_name = book->name;
1033
1034 /* some pre-generated books have title already set (from
1035 * maps), also don't bother looking for unique title if
1036 * we already used up all the available names! */
1037
1038 if (!tl)
1039 {
1040 LOG (llevError, "change_book_name(): can't find title list\n");
1041 numb = 0;
1042 }
1043 else
1044 numb = tl->number;
1045
1046 if (numb == maxnames)
1047 {
1048#ifdef ARCHIVE_DEBUG
1049 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1050#endif
1051 }
1052 /* shouldnt change map-maker books */
1053 else if (!book->title)
1054 do
1024 { 1055 {
1025 tmpbook->msg = book->msg; 1056 /* random book name */
1026 tmpbook->copy_to (book); 1057 new_text_name (book, msgtype);
1027 tmpbook->destroy (); 1058 add_author (book, msgtype); /* random author */
1059 tries++;
1028 } 1060 }
1061 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1029 1062
1030 book->title = t->authour; 1063 /* Now deal with 2 cases.
1031 book->name = t->name; 1064 * 1)If no space for a new title exists lets just restore
1032 book->level = t->level; 1065 * the old book properties. Remember, if the book had
1066 * matchd an older entry on the titlelist, we shouldnt
1067 * have called this routine in the first place!
1068 * 2) If we got a unique title, we need to add it to
1069 * the list.
1033 } 1070 */
1034 /* Don't have any default title, so lets make up a new one */
1035 else
1036 {
1037 int numb, maxnames = max_titles[msgtype];
1038 const char *old_title;
1039 const char *old_name;
1040 1071
1041 old_title = book->title; 1072 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1042 old_name = book->name; 1073 { /* got to check maxnames again */
1043
1044 /* some pre-generated books have title already set (from
1045 * maps), also don't bother looking for unique title if
1046 * we already used up all the available names! */
1047
1048 if (!tl)
1049 {
1050 LOG (llevError, "change_book_name(): can't find title list\n");
1051 numb = 0;
1052 }
1053 else
1054 numb = tl->number;
1055
1056 if (numb == maxnames)
1057 {
1058#ifdef ARCHIVE_DEBUG 1074#ifdef ARCHIVE_DEBUG
1059 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1075 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
1060#endif 1076#endif
1061 break; 1077 /* restore old book properties here */
1062 } 1078 book->title = old_title;
1063 /* shouldnt change map-maker books */ 1079
1064 else if (!book->title) 1080 if (rndm (4))
1065 do
1066 { 1081 {
1067 /* random book name */ 1082 /* Lets give the book a description to individualize it some */
1068 new_text_name (book, msgtype); 1083 char new_name[MAX_BUF];
1069 add_author (book, msgtype); /* random author */ 1084
1070 tries++; 1085 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1086
1087 book->name = new_name;
1071 } 1088 }
1072 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1073
1074 /* Now deal with 2 cases.
1075 * 1)If no space for a new title exists lets just restore
1076 * the old book properties. Remember, if the book had
1077 * matchd an older entry on the titlelist, we shouldnt
1078 * have called this routine in the first place!
1079 * 2) If we got a unique title, we need to add it to
1080 * the list.
1081 */
1082
1083 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1084 { /* got to check maxnames again */
1085#ifdef ARCHIVE_DEBUG
1086 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1087#endif
1088 /* restore old book properties here */
1089 book->title = old_title;
1090
1091 if (RANDOM () % 4)
1092 {
1093 /* Lets give the book a description to individualize it some */
1094 char new_name[MAX_BUF];
1095
1096 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1097
1098 book->name = new_name;
1099 }
1100 else 1089 else
1101 { 1090 {
1102 book->name = old_name; 1091 book->name = old_name;
1103 } 1092 }
1104 } 1093 }
1105 else if (book->title && strlen (book->msg) > 5) 1094 else if (book->title && strlen (book->msg) > 5)
1106 { /* archive if long msg texts */ 1095 { /* archive if long msg texts */
1107 add_book_to_list (book, msgtype); 1096 add_book_to_list (book, msgtype);
1108 } 1097 }
1109 } 1098 }
1110 break; 1099 break;
1111 } 1100 }
1112 1101
1113 default: 1102 default:
1114 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1103 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1115 return; 1104 return;
1116 } 1105 }
1117} 1106}
1118 1107
1119/***************************************************************************** 1108/*****************************************************************************
1120 * 1109 *
… …
1131 * list of all monsters in the current game. If level is non-zero, 1120 * list of all monsters in the current game. If level is non-zero,
1132 * then only monsters greater than that level will be returned. 1121 * then only monsters greater than that level will be returned.
1133 * Changed 971225 to be greater than equal to level passed. Also 1122 * Changed 971225 to be greater than equal to level passed. Also
1134 * made choosing by level more random. 1123 * made choosing by level more random.
1135 */ 1124 */
1136
1137object * 1125object *
1138get_random_mon (int level) 1126get_random_mon (int level)
1139{ 1127{
1140 objectlink *mon = first_mon_info; 1128 objectlink *mon = first_mon_info;
1141 int i = 0, monnr; 1129 int i = 0, monnr;
… …
1145 return (object *) NULL; 1133 return (object *) NULL;
1146 1134
1147 if (!level) 1135 if (!level)
1148 { 1136 {
1149 /* lets get a random monster from the mon_info linked list */ 1137 /* lets get a random monster from the mon_info linked list */
1150 monnr = RANDOM () % nrofmon; 1138 monnr = rndm (nrofmon);
1151 1139
1152 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1140 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1153 if (i++ == monnr) 1141 if (i++ == monnr)
1154 break; 1142 break;
1155 1143
… …
1182 { 1170 {
1183 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level); 1171 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
1184 return NULL; 1172 return NULL;
1185 } 1173 }
1186 1174
1187 monnr = RANDOM () % i; 1175 monnr = rndm (i);
1188 for (mon = first_mon_info; mon; mon = mon->next) 1176 for (mon = first_mon_info; mon; mon = mon->next)
1189 if (mon->ob->level >= level && monnr-- == 0) 1177 if (mon->ob->level >= level && monnr-- == 0)
1190 return mon->ob; 1178 return mon->ob;
1191 1179
1192 if (!mon) 1180 if (!mon)
… …
1199 1187
1200/* 1188/*
1201 * Returns a description of the monster. This really needs to be 1189 * Returns a description of the monster. This really needs to be
1202 * redone, as describe_item really gives a pretty internal description. 1190 * redone, as describe_item really gives a pretty internal description.
1203 */ 1191 */
1204 1192static const char *
1205char *
1206mon_desc (const object *mon) 1193mon_desc (const object *mon)
1207{ 1194{
1208 static char retbuf[HUGE_BUF]; 1195 static dynbuf_text buf; buf.clear ();
1209 1196
1210 sprintf (retbuf, " *** %s ***\n", &mon->name); 1197 buf.printf ("B<< %s >>\r", &mon->name);
1211 strcat (retbuf, describe_item (mon, NULL)); 1198 buf << describe_item (mon, 0);
1212 1199
1213 return retbuf; 1200 return buf;
1214} 1201}
1215 1202
1216 1203
1217/* This function returns the next monsters after 'tmp'. If no match is 1204/* This function returns the next monsters after 'tmp'. If no match is
1218 * found, it returns NULL (changed 0.94.3 to do this, since the 1205 * found, it returns NULL (changed 0.94.3 to do this, since the
1219 * calling function (mon_info_msg) seems to expect that. 1206 * calling function (mon_info_msg) seems to expect that.
1220 */ 1207 */
1221 1208static object *
1222object *
1223get_next_mon (object *tmp) 1209get_next_mon (object *tmp)
1224{ 1210{
1225 objectlink *mon; 1211 objectlink *mon;
1226 1212
1227 for (mon = first_mon_info; mon; mon = mon->next) 1213 for (mon = first_mon_info; mon; mon = mon->next)
… …
1236 else 1222 else
1237 return first_mon_info->ob; 1223 return first_mon_info->ob;
1238 1224
1239} 1225}
1240 1226
1241
1242
1243/* mon_info_msg() - generate a message detailing the properties 1227/* mon_info_msg() - generate a message detailing the properties
1244 * of a randomly selected monster. 1228 * of a randomly selected monster.
1245 */ 1229 */
1246 1230static const char *
1247char *
1248mon_info_msg (int level, int booksize) 1231mon_info_msg (int level, int booksize)
1249{ 1232{
1250 static char retbuf[BOOK_BUF]; 1233 static dynbuf_text buf; buf.clear ();
1251 char tmpbuf[HUGE_BUF];
1252 object *tmp;
1253 1234
1254 /*preamble */ 1235 /*preamble */
1255 strcpy (retbuf, "This beastiary contains:"); 1236 buf << "This beastiary contains:\n";
1256 1237
1257 /* lets print info on as many monsters as will fit in our 1238 /* lets print info on as many monsters as will fit in our
1258 * document. 1239 * document.
1259 * 8-96 Had to change this a bit, otherwise there would 1240 * 8-96 Had to change this a bit, otherwise there would
1260 * have been an impossibly large number of combinations 1241 * have been an impossibly large number of combinations
1261 * of text! (and flood out the available number of titles 1242 * of text! (and flood out the available number of titles
1262 * in the archive in a snap!) -b.t. 1243 * in the archive in a snap!) -b.t.
1263 */ 1244 */
1264 tmp = get_random_mon (level * 3); 1245 object *tmp = get_random_mon (level * 3);
1265 while (tmp) 1246 while (tmp && buf.size () < BOOK_BUF)
1266 { 1247 {
1267 /* monster description */ 1248 /* monster description */
1268 sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp)); 1249 buf.printf ("\n%s\n", mon_desc (tmp));
1269
1270 if (!book_overflow (retbuf, tmpbuf, booksize))
1271 strcat (retbuf, tmpbuf);
1272 else
1273 break;
1274 1250
1275 /* Note that the value this returns is not based on level */ 1251 /* Note that the value this returns is not based on level */
1276 tmp = get_next_mon (tmp); 1252 tmp = get_next_mon (tmp);
1277 } 1253 }
1278 1254
1279#ifdef BOOK_MSG_DEBUG
1280 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf));
1281 fprintf (logfile, " MADE THIS:\n%s\n", retbuf);
1282#endif
1283
1284 return retbuf; 1255 return buf;
1285} 1256}
1286 1257
1287 1258
1288/***************************************************************************** 1259/*****************************************************************************
1289 * Artifact msg generation code. 1260 * Artifact msg generation code.
1290 ****************************************************************************/ 1261 ****************************************************************************/
1291 1262
1292/* artifact_msg() - generate a message detailing the properties 1263/* artifact_msg() - generate a message detailing the properties
1293 * of 1-6 artifacts drawn sequentially from the artifact list. 1264 * of 1-6 artifacts drawn sequentially from the artifact list.
1294 */ 1265 */
1295const char * 1266static const char *
1296artifact_msg (int level, int booksize) 1267artifact_msg (int level, int booksize)
1297{ 1268{
1298 artifactlist *al = NULL; 1269 artifactlist *al = NULL;
1299 artifact *art; 1270 artifact *art;
1300 int chance, i, type, index; 1271 int chance, i, type, index;
1301 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1272 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1302 const char *ch; 1273 const char *ch;
1303 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1274 char name[MAX_BUF];
1304 static char retbuf[BOOK_BUF];
1305 object *tmp = NULL; 1275 object *tmp = NULL;
1276
1277 static dynbuf_text buf; buf.clear ();
1306 1278
1307 /* values greater than 5 create msg buffers that are too big! */ 1279 /* values greater than 5 create msg buffers that are too big! */
1308 if (book_entries > 5) 1280 if (book_entries > 5)
1309 book_entries = 5; 1281 book_entries = 5;
1310 1282
… …
1314 * for that type exists! 1286 * for that type exists!
1315 */ 1287 */
1316 i = 0; 1288 i = 0;
1317 do 1289 do
1318 { 1290 {
1319 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1291 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1320 type = art_name_array[index].type; 1292 type = art_name_array[index].type;
1321 al = find_artifactlist (type); 1293 al = find_artifactlist (type);
1322 i++; 1294 i++;
1323 } 1295 }
1324 while ((al == NULL) && (i < 10)); 1296 while ((al == NULL) && (i < 10));
… …
1327 return "None"; 1299 return "None";
1328 1300
1329 /* There is no reason to start on the artifact list at the begining. Lets 1301 /* There is no reason to start on the artifact list at the begining. Lets
1330 * take our starting position randomly... */ 1302 * take our starting position randomly... */
1331 art = al->items; 1303 art = al->items;
1332 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1304 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1333 { 1305 {
1334 if (art == NULL) 1306 if (!art)
1335 art = al->items; /* hmm, out of stuff, loop back around */ 1307 art = al->items; /* hmm, out of stuff, loop back around */
1308
1336 art = art->next; 1309 art = art->next;
1337 } 1310 }
1338 1311
1339 /* the base 'generic' name for our artifact */ 1312 /* the base 'generic' name for our artifact */
1340 assign (name, art_name_array[index].name); 1313 assign (name, art_name_array[index].name);
1341 1314
1342 /* Ok, lets print out the contents */ 1315 /* Ok, lets print out the contents */
1343 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1316 buf.printf ("Herein %s detailed %s...\n",
1317 book_entries > 1 ? "are" : "is",
1318 book_entries > 1 ? "some artifacts" : "an artifact");
1344 1319
1345 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1320 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
1346 * as long as we have space up to the allowed max # (book_entires) 1321 * as long as we have space up to the allowed max # (book_entires)
1347 */ 1322 */
1348 while (book_entries > 0) 1323 while (book_entries > 0 && buf.size () < BOOK_BUF)
1349 { 1324 {
1350 1325
1351 if (art == NULL) 1326 if (!art)
1352 art = al->items; 1327 art = al->items;
1353 1328
1354 /* separator of items */ 1329 buf << '\n';
1355 strcpy (buf, "--- \n");
1356 1330
1357 /* Name */ 1331 /* Name */
1358 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1332 if (art->allowed && art->allowed->name != shstr_All)
1359 { 1333 {
1360 linked_char *temp, *next = art->allowed; 1334 linked_char *temp, *next = art->allowed;
1361 1335
1362 do 1336 do
1363 { 1337 {
1364 temp = next; 1338 temp = next;
1365 next = next->next; 1339 next = next->next;
1366 } 1340 }
1367 while (next && !RANDOM () % 2); 1341 while (next && rndm (2));
1342
1368 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1343 buf.printf ("A B<< %s of %s >>", &temp->name, &art->item->name);
1369 } 1344 }
1370 else /* default name is used */ 1345 else /* default name is used */
1371 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1346 buf.printf ("The B<< %s of %s >>", name, &art->item->name);
1347
1348 buf << " is ";
1372 1349
1373 /* chance of finding */ 1350 /* chance of finding */
1374 chance = (int) (100 * ((float) art->chance / al->total_chance)); 1351 chance = (int) (100 * ((float) art->chance / al->total_chance));
1375 if (chance >= 20) 1352 if (chance >= 20)
1376 sprintf (sbuf, "an uncommon"); 1353 buf << "an uncommon";
1377 else if (chance >= 10) 1354 else if (chance >= 10)
1378 sprintf (sbuf, "an unusual"); 1355 buf << "an unusual";
1379 else if (chance >= 5) 1356 else if (chance >= 5)
1380 sprintf (sbuf, "a rare"); 1357 buf << "a rare";
1381 else 1358 else
1382 sprintf (sbuf, "a very rare"); 1359 buf << "a very rare";
1383 sprintf (buf, "%s is %s\n", buf, sbuf);
1384 1360
1385 /* value of artifact */ 1361 /* value of artifact */
1386 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1362 buf << " item with a value that is " << art->item->value << " times normal.\n";
1387 1363
1388 /* include the message about the artifact, if exists, and book 1364 /* include the message about the artifact, if exists, and book
1389 * level is kinda high */ 1365 * level is kinda high */
1390 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1366 if (art->item->msg
1367 && rndm (4) + 1 < level)
1391 strcat (buf, art->item->msg); 1368 buf << art->item->msg;
1392 1369
1393 /* properties of the artifact */ 1370 /* properties of the artifact */
1394 tmp = object::create (); 1371 tmp = object::create ();
1395 add_abilities (tmp, art->item); 1372 add_abilities (tmp, art->item);
1396 tmp->type = type; 1373 tmp->type = type;
1397 SET_FLAG (tmp, FLAG_IDENTIFIED); 1374 SET_FLAG (tmp, FLAG_IDENTIFIED);
1398 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1375 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
1399 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1376 buf << "\rProperties of this artifact include:\r" << ch << "\n";
1377
1400 tmp->destroy (); 1378 tmp->destroy ();
1401 /* add the buf if it will fit */
1402 if (!book_overflow (retbuf, buf, booksize))
1403 strcat (retbuf, buf);
1404 else
1405 break;
1406 1379
1407 art = art->next; 1380 art = art->next;
1408 book_entries--; 1381 book_entries--;
1409 } 1382 }
1410 1383
1411#ifdef BOOK_MSG_DEBUG
1412 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf));
1413 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1414#endif
1415 return retbuf; 1384 return buf;
1416} 1385}
1417 1386
1418/***************************************************************************** 1387/*****************************************************************************
1419 * Spellpath message generation 1388 * Spellpath message generation
1420 *****************************************************************************/ 1389 *****************************************************************************/
1421 1390
1422/* spellpath_msg() - generate a message detailing the member 1391/* spellpath_msg() - generate a message detailing the member
1423 * incantations/prayers (and some of their properties) belonging to 1392 * incantations/prayers (and some of their properties) belonging to
1424 * a given spellpath. 1393 * a given spellpath.
1425 */ 1394 */
1426 1395static char *
1427char *
1428spellpath_msg (int level, int booksize) 1396spellpath_msg (int level, int booksize)
1429{ 1397{
1398 static dynbuf_text buf; buf.clear ();
1399
1430 static char retbuf[BOOK_BUF]; 1400 static char retbuf[BOOK_BUF];
1431 char tmpbuf[BOOK_BUF]; 1401 char tmpbuf[BOOK_BUF];
1432 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1402 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1433 int did_first_sp = 0;
1434 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1403 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1435 archetype *at; 1404 archetype *at;
1436 1405
1437 /* Preamble */ 1406 /* Preamble */
1438 sprintf (retbuf, "Herein are detailed the names of %s\n", prayers ? "prayers" : "incantations"); 1407 buf << "Herein are detailed the names of "
1408 << (prayers ? "prayers" : "incantations");
1439 1409
1440 if (path == -1) 1410 if (path == -1)
1441 strcat (retbuf, "having no known spell path.\n"); 1411 buf << " having no known spell path.\n";
1442 else 1412 else
1443 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1413 buf << " belonging to the path of B<< " << spellpathnames[path] << " >>:\n\n";
1414
1415 int seen = 0;
1444 1416
1445 for_all_archetypes (at) 1417 for_all_archetypes (at)
1446 {
1447 /* Determine if this is an appropriate spell. Must 1418 /* Determine if this is an appropriate spell. Must
1448 * be of matching path, must be of appropriate type (prayer 1419 * be of matching path, must be of appropriate type (prayer
1449 * or not), and must be within the valid level range. 1420 * or not), and must be within the valid level range.
1450 */ 1421 */
1451 if (at->type == SPELL && at->path_attuned & pnum && 1422 if (at->type == SPELL && at->path_attuned & pnum &&
1452 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8))) 1423 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1453 { 1424 {
1454 assign (tmpbuf, at->object::name); 1425 seen = 1;
1455 1426 buf << at->object::name << '\r';
1456 if (book_overflow (retbuf, tmpbuf, booksize))
1457 break;
1458 else
1459 {
1460 if (did_first_sp)
1461 strcat (retbuf, ",\n");
1462 did_first_sp = 1;
1463 strcat (retbuf, tmpbuf);
1464 }
1465 } 1427 }
1466 } 1428
1467 /* Geez, no spells were generated. */ 1429 /* Geez, no spells were generated. */
1468 if (!did_first_sp) 1430 if (!seen)
1469 {
1470 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1431 if (rndm (4)) /* usually, lets make a recursive call... */
1471 spellpath_msg (level, booksize); 1432 return spellpath_msg (level, booksize);
1472 else /* give up, cause knowing no spells exist for path is info too. */ 1433 else /* give up, cause knowing no spells exist for path is info too. */
1473 strcat (retbuf, "\n - no known spells exist -\n"); 1434 buf << "- no known spells exist.\n";
1474 } 1435
1475 else
1476 {
1477 strcat (retbuf, "\n");
1478 }
1479 return retbuf; 1436 return buf;
1480} 1437}
1481 1438
1482/* formula_msg() - generate a message detailing the properties 1439/* formula_msg() - generate a message detailing the properties
1483 * of a randomly selected alchemical formula. 1440 * of a randomly selected alchemical formula.
1484 */ 1441 */
1485void 1442static void
1486make_formula_book (object *book, int level) 1443make_formula_book (object *book, int level)
1487{ 1444{
1488 char retbuf[BOOK_BUF], title[MAX_BUF]; 1445 char title[MAX_BUF];
1489 recipelist *fl; 1446 recipelist *fl;
1490 recipe *formula = NULL; 1447 recipe *formula = NULL;
1491 int chance; 1448 int chance;
1492 1449
1450 static dynbuf_text buf; buf.clear ();
1451
1493 /* the higher the book level, the more complex (ie number of 1452 /* the higher the book level, the more complex (ie number of
1494 * ingredients) the formula can be. 1453 * ingredients) the formula can be.
1495 */ 1454 */
1496 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1455 fl = get_formulalist (rndm (level) / 3 + 1);
1497 1456
1498 if (!fl) 1457 if (!fl)
1499 fl = get_formulalist (1); /* safety */ 1458 fl = get_formulalist (1); /* safety */
1500 1459
1501 if (fl->total_chance == 0) 1460 if (fl->total_chance == 0)
… …
1505 add_author (book, 4); 1464 add_author (book, 4);
1506 return; 1465 return;
1507 } 1466 }
1508 1467
1509 /* get a random formula, weighted by its bookchance */ 1468 /* get a random formula, weighted by its bookchance */
1510 chance = RANDOM () % fl->total_chance; 1469 chance = rndm (fl->total_chance);
1511 for (formula = fl->items; formula != NULL; formula = formula->next) 1470 for (formula = fl->items; formula; formula = formula->next)
1512 { 1471 {
1513 chance -= formula->chance; 1472 chance -= formula->chance;
1473
1514 if (chance <= 0) 1474 if (chance <= 0)
1515 break; 1475 break;
1516 } 1476 }
1517 1477
1518 if (!formula || formula->arch_names <= 0) 1478 if (!formula || formula->arch_names <= 0)
1519 { 1479 {
1520 book->msg = "<indecipherable text>\n"; 1480 book->msg = "<indecipherable text>\n";
1521 new_text_name (book, 4); 1481 new_text_name (book, 4);
1522 add_author (book, 4); 1482 add_author (book, 4);
1523 1483 return;
1524 } 1484 }
1485
1486 /* looks like a formula was found. Base the amount
1487 * of information on the booklevel and the spellevel
1488 * of the formula. */
1489
1490 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1491 archetype *at;
1492
1493 /* preamble */
1494 buf << "Herein is described a project using B<< "
1495 << (formula->skill ? &formula->skill : "an unknown skill")
1496 << " >>:\n\n";
1497
1498 if ((at = archetype::find (op_name)))
1499 op_name = at->object::name;
1525 else 1500 else
1501 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1502
1503 /* item name */
1504 if (formula->title != shstr_NONE)
1505 {
1506 buf.printf ("The B<< %s of %s >>", op_name, &formula->title);
1507 /* This results in things like pile of philo. sulfur.
1508 * while philo. sulfur may look better, without this,
1509 * you get things like 'the wise' because its missing the
1510 * water of section.
1511 */
1512 sprintf (title, "%s: %s of %s",
1513 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1526 { 1514 }
1527 /* looks like a formula was found. Base the amount 1515 else
1528 * of information on the booklevel and the spellevel 1516 {
1529 * of the formula. */ 1517 buf << "The B<< " << op_name;
1530 1518
1531 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1519 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1520 if (at->title)
1521 {
1522 buf << " " << at->title;
1523 strcat (title, " ");
1524 strcat (title, at->title);
1525 }
1526
1527 buf << " >>";
1528 }
1529
1530 /* Lets name the book something meaningful ! */
1531 book->name = title;
1532 book->title = NULL;
1533
1534 /* ingredients to make it */
1535 if (formula->ingred)
1536 {
1537 linked_char *next;
1532 archetype *at; 1538 archetype *at;
1533 1539
1534 /* preamble */
1535 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1536
1537 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1538 op_name = at->object::name;
1539 else
1540 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1541
1542 /* item name */
1543 if (strcmp (formula->title, "NONE"))
1544 {
1545 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1546 /* This results in things like pile of philo. sulfur.
1547 * while philo. sulfur may look better, without this,
1548 * you get things like 'the wise' because its missing the
1549 * water of section.
1550 */
1551 sprintf (title, "%s: %s of %s",
1552 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1553 }
1554 else
1555 {
1556 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1557 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name);
1558 if (at->title)
1559 {
1560 strcat (retbuf, " ");
1561 strcat (retbuf, at->title);
1562 strcat (title, " ");
1563 strcat (title, at->title);
1564 }
1565 }
1566 /* Lets name the book something meaningful ! */
1567 book->name = title;
1568 book->title = NULL;
1569
1570 /* ingredients to make it */
1571 if (formula->ingred != NULL)
1572 {
1573 linked_char *next;
1574 archetype *at;
1575
1576 at = archetype::find (formula->cauldron); 1540 at = archetype::find (formula->cauldron);
1577 1541
1578 sprintf (retbuf + strlen (retbuf), 1542 buf.printf (" may be made at %s using the following ingredients:\n\n",
1579 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place"); 1543 at ? query_name (at) : "an appropriate place");
1580 1544
1581 for (next = formula->ingred; next != NULL; next = next->next) 1545 for (next = formula->ingred; next; next = next->next)
1582 { 1546 buf << next->name << '\r';
1583 strcat (retbuf, next->name); 1547 }
1584 strcat (retbuf, "\n");
1585 }
1586 }
1587 else 1548 else
1588 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title); 1549 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title);
1589 if (retbuf[strlen (retbuf) - 1] != '\n')
1590 strcat (retbuf, "\n");
1591 1550
1592 book->msg = retbuf; 1551 book->msg = buf;
1593 }
1594} 1552}
1595 1553
1596#define DESCRIBE_PATH(retbuf, variable, name) \ 1554#define DESCRIBE_PATH(retbuf, variable, name) \
1597 if(variable) { \ 1555 if(variable) { \
1598 int i,j=0; \ 1556 int i,j=0; \
… …
1609 } 1567 }
1610 1568
1611/* god_info_msg() - generate a message detailing the properties 1569/* god_info_msg() - generate a message detailing the properties
1612 * of a random god. Used by the book hack. b.t. 1570 * of a random god. Used by the book hack. b.t.
1613 */ 1571 */
1614const char * 1572static const char *
1615god_info_msg (int level, int booksize) 1573god_info_msg (int level, int booksize)
1616{ 1574{
1617 static char retbuf[BOOK_BUF]; 1575 static char retbuf[BOOK_BUF];
1618 const char *name = NULL; 1576 const char *name = NULL;
1619 char buf[BOOK_BUF]; 1577 char buf[BOOK_BUF];
… …
1646 * this ... 1604 * this ...
1647 */ 1605 */
1648 while (level > 0) 1606 while (level > 0)
1649 { 1607 {
1650 sprintf (buf, " "); 1608 sprintf (buf, " ");
1651 if (level == 2 && RANDOM () % 2) 1609 if (level == 2 && rndm (2))
1652 { /* enemy god */ 1610 { /* enemy god */
1653 const char *enemy = god->title; 1611 const char *enemy = god->title;
1654 1612
1655 if (enemy) 1613 if (enemy)
1656 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1614 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1657 } 1615 }
1658 1616
1659 if (level == 3 && RANDOM () % 2) 1617 if (level == 3 && rndm (2))
1660 { /* enemy race, what the god's holy word effects */ 1618 { /* enemy race, what the god's holy word effects */
1661 const char *enemy = god->slaying; 1619 const char *enemy = god->slaying;
1662 1620
1663 if (enemy && !(god->path_denied & PATH_TURNING)) 1621 if (enemy && !(god->path_denied & PATH_TURNING))
1664 if ((i = nstrtok (enemy, ",")) > 0) 1622 if ((i = nstrtok (enemy, ",")) > 0)
… …
1673 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1631 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1674 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1632 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1675 } 1633 }
1676 } 1634 }
1677 1635
1678 if (level == 4 && RANDOM () % 2) 1636 if (level == 4 && rndm (2))
1679 { /* Priest of god gets these protect,vulnerable... */ 1637 { /* Priest of god gets these protect,vulnerable... */
1680 char tmpbuf[MAX_BUF]; 1638 char tmpbuf[MAX_BUF];
1681 1639
1682 if (const char *cp = describe_resistance (god, 1)) 1640 if (const char *cp = describe_resistance (god, 1))
1683 { /* This god does have protections */ 1641 { /* This god does have protections */
… …
1689 } 1647 }
1690 else 1648 else
1691 sprintf (buf, " "); 1649 sprintf (buf, " ");
1692 } 1650 }
1693 1651
1694 if (level == 5 && RANDOM () % 2) 1652 if (level == 5 && rndm (2))
1695 { /* aligned race, summoning */ 1653 { /* aligned race, summoning */
1696 const char *race = god->race; /* aligned race */ 1654 const char *race = god->race; /* aligned race */
1697 1655
1698 if (race && !(god->path_denied & PATH_SUMMON)) 1656 if (race && !(god->path_denied & PATH_SUMMON))
1699 if ((i = nstrtok (race, ",")) > 0) 1657 if ((i = nstrtok (race, ",")) > 0)
… …
1707 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1665 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1708 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1666 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1709 } 1667 }
1710 } 1668 }
1711 1669
1712 if (level == 6 && RANDOM () % 2) 1670 if (level == 6 && rndm (2))
1713 { /* blessing,curse properties of the god */ 1671 { /* blessing,curse properties of the god */
1714 char tmpbuf[MAX_BUF]; 1672 char tmpbuf[MAX_BUF];
1715 1673
1716 if (const char *cp = describe_resistance (god, 1)) 1674 if (const char *cp = describe_resistance (god, 1))
1717 { /* This god does have protections */ 1675 { /* This god does have protections */
… …
1724 else 1682 else
1725 sprintf (buf, " "); 1683 sprintf (buf, " ");
1726 1684
1727 } 1685 }
1728 1686
1729 if (level == 8 && RANDOM () % 2) 1687 if (level == 8 && rndm (2))
1730 { /* immunity, holy possession */ 1688 { /* immunity, holy possession */
1731 int has_effect = 0, tmpvar; 1689 int has_effect = 0, tmpvar;
1732 char tmpbuf[MAX_BUF]; 1690 char tmpbuf[MAX_BUF];
1733 1691
1734 sprintf (tmpbuf, "\n"); 1692 sprintf (tmpbuf, "\n");
… …
1752 } 1710 }
1753 else 1711 else
1754 sprintf (buf, " "); 1712 sprintf (buf, " ");
1755 } 1713 }
1756 1714
1757 if (level == 12 && RANDOM () % 2) 1715 if (level == 12 && rndm (2))
1758 { /* spell paths */ 1716 { /* spell paths */
1759 int has_effect = 0, tmpvar; 1717 int has_effect = 0, tmpvar;
1760 char tmpbuf[MAX_BUF]; 1718 char tmpbuf[MAX_BUF];
1761 1719
1762 sprintf (tmpbuf, "\n"); 1720 sprintf (tmpbuf, "\n");
… …
1806 { /* we got no information beyond the preamble! */ 1764 { /* we got no information beyond the preamble! */
1807 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1765 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1808 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1766 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1809 } 1767 }
1810#ifdef BOOK_MSG_DEBUG 1768#ifdef BOOK_MSG_DEBUG
1811 LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf)); 1769 LOG (llevDebug, "\n god_info_msg() created string: %d\n", strlen (retbuf));
1812 fprintf (logfile, " MADE THIS:\n%s", retbuf); 1770 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1813#endif 1771#endif
1814 return retbuf; 1772 return retbuf;
1815} 1773}
1816 1774
1817/* tailor_readable_ob()- The main routine. This chooses a random 1775/* tailor_readable_ob()- The main routine. This chooses a random
… …
1832 */ 1790 */
1833void 1791void
1834tailor_readable_ob (object *book, int msg_type) 1792tailor_readable_ob (object *book, int msg_type)
1835{ 1793{
1836 char msgbuf[BOOK_BUF]; 1794 char msgbuf[BOOK_BUF];
1837 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1795 int level = book->level ? rndm (book->level) + 1 : 1;
1838 int book_buf_size; 1796 int book_buf_size;
1839 1797
1840 /* safety */ 1798 /* safety */
1841 if (book->type != BOOK) 1799 if (book->type != BOOK)
1842 return; 1800 return;
… …
1856 * 2) make sure there is an entry in max_titles[] array. 1814 * 2) make sure there is an entry in max_titles[] array.
1857 * 3) make sure there are entries for your case in new_text_title() 1815 * 3) make sure there are entries for your case in new_text_title()
1858 * and add_authour(). 1816 * and add_authour().
1859 * 4) you may want separate authour/book name arrays in read.h 1817 * 4) you may want separate authour/book name arrays in read.h
1860 */ 1818 */
1861 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 8); 1819 msg_type = msg_type > 0 ? msg_type : rndm (8);
1862 switch (msg_type) 1820 switch (msg_type*0+4)//D
1863 { 1821 {
1864 case 1: /* monster attrib */ 1822 case 1: /* monster attrib */
1865 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1823 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1866 break; 1824 break;
1867 case 2: /* artifact attrib */ 1825 case 2: /* artifact attrib */
… …
1890 { 1848 {
1891 book->msg = msgbuf; 1849 book->msg = msgbuf;
1892 /* lets give the "book" a new name, which may be a compound word */ 1850 /* lets give the "book" a new name, which may be a compound word */
1893 change_book (book, msg_type); 1851 change_book (book, msg_type);
1894 } 1852 }
1895
1896} 1853}
1897 1854
1898 1855
1899/***************************************************************************** 1856/*****************************************************************************
1900 * 1857 *

Diff Legend

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