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.41 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.45 by root, Thu Oct 15 22:50:41 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,2008 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 it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
30 30
31#include <global.h> 31#include <global.h>
32#include <book.h> 32#include <book.h>
33#include <living.h> 33#include <living.h>
34#include <spells.h> 34#include <spells.h>
35
36 35
37/* Define this if you want to archive book titles by contents. 36/* Define this if you want to archive book titles by contents.
38 * This option should enforce UNIQUE combinations of titles,authors and 37 * This option should enforce UNIQUE combinations of titles,authors and
39 * msg contents during and *between* game sessions. 38 * msg contents during and *between* game sessions.
40 * 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
570 * (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. */
571 570
572/* nstrtok() - simple routine to return the number of list 571/* nstrtok() - simple routine to return the number of list
573 * items in buf1 as separated by the value of buf2 572 * items in buf1 as separated by the value of buf2
574 */ 573 */
575 574static int
576int
577nstrtok (const char *buf1, const char *buf2) 575nstrtok (const char *buf1, const char *buf2)
578{ 576{
579 char *tbuf, sbuf[12], buf[MAX_BUF]; 577 char *tbuf, sbuf[12], buf[MAX_BUF];
580 int number = 0; 578 int number = 0;
581 579
594 592
595/* strtoktolin() - takes a string in buf1 and separates it into 593/* strtoktolin() - takes a string in buf1 and separates it into
596 * a list of strings delimited by buf2. Then returns a comma 594 * a list of strings delimited by buf2. Then returns a comma
597 * separated string w/ decent punctuation. 595 * separated string w/ decent punctuation.
598 */ 596 */
599 597static char *
600char *
601strtoktolin (const char *buf1, const char *buf2) 598strtoktolin (const char *buf1, const char *buf2)
602{ 599{
603 int maxi, i = nstrtok (buf1, buf2); 600 int maxi, i = nstrtok (buf1, buf2);
604 char *tbuf, buf[MAX_BUF], sbuf[12]; 601 char *tbuf, buf[MAX_BUF], sbuf[12];
605 static char rbuf[BOOK_BUF]; 602 static char rbuf[BOOK_BUF];
622 tbuf = strtok (NULL, sbuf); 619 tbuf = strtok (NULL, sbuf);
623 } 620 }
624 return (char *) rbuf; 621 return (char *) rbuf;
625} 622}
626 623
627int 624static int
628book_overflow (const char *buf1, const char *buf2, int booksize) 625book_overflow (const char *buf1, const char *buf2, int booksize)
629{ 626{
630
631 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 */
632 || buf_overflow (buf1, buf2, booksize)) 628 || buf_overflow (buf1, buf2, booksize))
633 return 1; 629 return 1;
630
634 return 0; 631 return 0;
635
636
637} 632}
638 633
639/***************************************************************************** 634/*****************************************************************************
640 * 635 *
641 * Start of initialisation related functions. 636 * Start of initialisation related functions.
818 else 813 else
819 t = t->next; 814 t = t->next;
820 815
821#ifdef ARCHIVE_DEBUG 816#ifdef ARCHIVE_DEBUG
822 if (t) 817 if (t)
823 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);
824#endif 819#endif
825 820
826 return t; 821 return t;
827} 822}
828 823
830 * handled directly in change_book_name(). Names are based on text 825 * handled directly in change_book_name(). Names are based on text
831 * msgtype 826 * msgtype
832 * this sets book book->name based on msgtype given. What name 827 * this sets book book->name based on msgtype given. What name
833 * is given is based on various criteria 828 * is given is based on various criteria
834 */ 829 */
835
836static void 830static void
837new_text_name (object *book, int msgtype) 831new_text_name (object *book, int msgtype)
838{ 832{
839 int nbr; 833 int nbr;
840 char name[MAX_BUF]; 834 char name[MAX_BUF];
976 970
977 /* We have stuff we need to write now */ 971 /* We have stuff we need to write now */
978 need_to_write_bookarchive = 1; 972 need_to_write_bookarchive = 1;
979 973
980#ifdef ARCHIVE_DEBUG 974#ifdef ARCHIVE_DEBUG
981 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);
982#endif 976#endif
983 977
984} 978}
985 979
986 980
992 * levels and architypes. -b.t. 986 * levels and architypes. -b.t.
993 */ 987 */
994 988
995#define MAX_TITLE_CHECK 20 989#define MAX_TITLE_CHECK 20
996 990
997void 991static void
998change_book (object *book, int msgtype) 992change_book (object *book, int msgtype)
999{ 993{
1000 int nbr = sizeof (book_descrpt) / sizeof (char *); 994 int nbr = sizeof (book_descrpt) / sizeof (char *);
1001 995
1002 switch (book->type) 996 switch (book->type)
1052 if (numb == maxnames) 1046 if (numb == maxnames)
1053 { 1047 {
1054#ifdef ARCHIVE_DEBUG 1048#ifdef ARCHIVE_DEBUG
1055 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1049 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1056#endif 1050#endif
1057 break;
1058 } 1051 }
1059 /* shouldnt change map-maker books */ 1052 /* shouldnt change map-maker books */
1060 else if (!book->title) 1053 else if (!book->title)
1061 do 1054 do
1062 { 1055 {
1077 */ 1070 */
1078 1071
1079 if (tries == MAX_TITLE_CHECK || numb == maxnames) 1072 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1080 { /* got to check maxnames again */ 1073 { /* got to check maxnames again */
1081#ifdef ARCHIVE_DEBUG 1074#ifdef ARCHIVE_DEBUG
1082 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames); 1075 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
1083#endif 1076#endif
1084 /* restore old book properties here */ 1077 /* restore old book properties here */
1085 book->title = old_title; 1078 book->title = old_title;
1086 1079
1087 if (rndm (4)) 1080 if (rndm (4))
1127 * 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,
1128 * then only monsters greater than that level will be returned. 1121 * then only monsters greater than that level will be returned.
1129 * Changed 971225 to be greater than equal to level passed. Also 1122 * Changed 971225 to be greater than equal to level passed. Also
1130 * made choosing by level more random. 1123 * made choosing by level more random.
1131 */ 1124 */
1132
1133object * 1125object *
1134get_random_mon (int level) 1126get_random_mon (int level)
1135{ 1127{
1136 objectlink *mon = first_mon_info; 1128 objectlink *mon = first_mon_info;
1137 int i = 0, monnr; 1129 int i = 0, monnr;
1195 1187
1196/* 1188/*
1197 * Returns a description of the monster. This really needs to be 1189 * Returns a description of the monster. This really needs to be
1198 * redone, as describe_item really gives a pretty internal description. 1190 * redone, as describe_item really gives a pretty internal description.
1199 */ 1191 */
1200 1192static const char *
1201char *
1202mon_desc (const object *mon) 1193mon_desc (const object *mon)
1203{ 1194{
1204 static char retbuf[HUGE_BUF]; 1195 static dynbuf_text buf; buf.clear ();
1205 1196
1206 sprintf (retbuf, " *** %s ***\n", &mon->name); 1197 buf.printf ("B<< %s >>\r", &mon->name);
1207 strcat (retbuf, describe_item (mon, NULL)); 1198 buf << describe_item (mon, 0);
1208 1199
1209 return retbuf; 1200 return buf;
1210} 1201}
1211 1202
1212 1203
1213/* 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
1214 * 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
1215 * calling function (mon_info_msg) seems to expect that. 1206 * calling function (mon_info_msg) seems to expect that.
1216 */ 1207 */
1217 1208static object *
1218object *
1219get_next_mon (object *tmp) 1209get_next_mon (object *tmp)
1220{ 1210{
1221 objectlink *mon; 1211 objectlink *mon;
1222 1212
1223 for (mon = first_mon_info; mon; mon = mon->next) 1213 for (mon = first_mon_info; mon; mon = mon->next)
1232 else 1222 else
1233 return first_mon_info->ob; 1223 return first_mon_info->ob;
1234 1224
1235} 1225}
1236 1226
1237
1238
1239/* mon_info_msg() - generate a message detailing the properties 1227/* mon_info_msg() - generate a message detailing the properties
1240 * of a randomly selected monster. 1228 * of a randomly selected monster.
1241 */ 1229 */
1242 1230static const char *
1243char *
1244mon_info_msg (int level, int booksize) 1231mon_info_msg (int level, int booksize)
1245{ 1232{
1246 static char retbuf[BOOK_BUF]; 1233 static dynbuf_text buf; buf.clear ();
1247 char tmpbuf[HUGE_BUF];
1248 object *tmp;
1249 1234
1250 /*preamble */ 1235 /*preamble */
1251 strcpy (retbuf, "This beastiary contains:"); 1236 buf << "This beastiary contains:\n";
1252 1237
1253 /* 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
1254 * document. 1239 * document.
1255 * 8-96 Had to change this a bit, otherwise there would 1240 * 8-96 Had to change this a bit, otherwise there would
1256 * have been an impossibly large number of combinations 1241 * have been an impossibly large number of combinations
1257 * of text! (and flood out the available number of titles 1242 * of text! (and flood out the available number of titles
1258 * in the archive in a snap!) -b.t. 1243 * in the archive in a snap!) -b.t.
1259 */ 1244 */
1260 tmp = get_random_mon (level * 3); 1245 object *tmp = get_random_mon (level * 3);
1261 while (tmp) 1246 while (tmp && buf.size () < BOOK_BUF)
1262 { 1247 {
1263 /* monster description */ 1248 /* monster description */
1264 sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp)); 1249 buf.printf ("\n%s\n", mon_desc (tmp));
1265
1266 if (!book_overflow (retbuf, tmpbuf, booksize))
1267 strcat (retbuf, tmpbuf);
1268 else
1269 break;
1270 1250
1271 /* Note that the value this returns is not based on level */ 1251 /* Note that the value this returns is not based on level */
1272 tmp = get_next_mon (tmp); 1252 tmp = get_next_mon (tmp);
1273 } 1253 }
1274 1254
1275#ifdef BOOK_MSG_DEBUG
1276 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf));
1277 fprintf (logfile, " MADE THIS:\n%s\n", retbuf);
1278#endif
1279
1280 return retbuf; 1255 return buf;
1281} 1256}
1282 1257
1283 1258
1284/***************************************************************************** 1259/*****************************************************************************
1285 * Artifact msg generation code. 1260 * Artifact msg generation code.
1286 ****************************************************************************/ 1261 ****************************************************************************/
1287 1262
1288/* artifact_msg() - generate a message detailing the properties 1263/* artifact_msg() - generate a message detailing the properties
1289 * of 1-6 artifacts drawn sequentially from the artifact list. 1264 * of 1-6 artifacts drawn sequentially from the artifact list.
1290 */ 1265 */
1291const char * 1266static const char *
1292artifact_msg (int level, int booksize) 1267artifact_msg (int level, int booksize)
1293{ 1268{
1294 artifactlist *al = NULL; 1269 artifactlist *al = NULL;
1295 artifact *art; 1270 artifact *art;
1296 int chance, i, type, index; 1271 int chance, i, type, index;
1297 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1; 1272 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1298 const char *ch; 1273 const char *ch;
1299 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1274 char name[MAX_BUF];
1300 static char retbuf[BOOK_BUF];
1301 object *tmp = NULL; 1275 object *tmp = NULL;
1276
1277 static dynbuf_text buf; buf.clear ();
1302 1278
1303 /* values greater than 5 create msg buffers that are too big! */ 1279 /* values greater than 5 create msg buffers that are too big! */
1304 if (book_entries > 5) 1280 if (book_entries > 5)
1305 book_entries = 5; 1281 book_entries = 5;
1306 1282
1335 1311
1336 /* the base 'generic' name for our artifact */ 1312 /* the base 'generic' name for our artifact */
1337 assign (name, art_name_array[index].name); 1313 assign (name, art_name_array[index].name);
1338 1314
1339 /* Ok, lets print out the contents */ 1315 /* Ok, lets print out the contents */
1340 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");
1341 1319
1342 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1320 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
1343 * 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)
1344 */ 1322 */
1345 while (book_entries > 0) 1323 while (book_entries > 0 && buf.size () < BOOK_BUF)
1346 { 1324 {
1347 1325
1348 if (art == NULL) 1326 if (!art)
1349 art = al->items; 1327 art = al->items;
1350 1328
1351 /* separator of items */ 1329 buf << '\n';
1352 strcpy (buf, "--- \n");
1353 1330
1354 /* Name */ 1331 /* Name */
1355 if (art->allowed && art->allowed->name != shstr_All) 1332 if (art->allowed && art->allowed->name != shstr_All)
1356 { 1333 {
1357 linked_char *temp, *next = art->allowed; 1334 linked_char *temp, *next = art->allowed;
1360 { 1337 {
1361 temp = next; 1338 temp = next;
1362 next = next->next; 1339 next = next->next;
1363 } 1340 }
1364 while (next && rndm (2)); 1341 while (next && rndm (2));
1342
1365 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);
1366 } 1344 }
1367 else /* default name is used */ 1345 else /* default name is used */
1368 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 ";
1369 1349
1370 /* chance of finding */ 1350 /* chance of finding */
1371 chance = (int) (100 * ((float) art->chance / al->total_chance)); 1351 chance = (int) (100 * ((float) art->chance / al->total_chance));
1372 if (chance >= 20) 1352 if (chance >= 20)
1373 sprintf (sbuf, "an uncommon"); 1353 buf << "an uncommon";
1374 else if (chance >= 10) 1354 else if (chance >= 10)
1375 sprintf (sbuf, "an unusual"); 1355 buf << "an unusual";
1376 else if (chance >= 5) 1356 else if (chance >= 5)
1377 sprintf (sbuf, "a rare"); 1357 buf << "a rare";
1378 else 1358 else
1379 sprintf (sbuf, "a very rare"); 1359 buf << "a very rare";
1380 sprintf (buf, "%s is %s\n", buf, sbuf);
1381 1360
1382 /* value of artifact */ 1361 /* value of artifact */
1383 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";
1384 1363
1385 /* include the message about the artifact, if exists, and book 1364 /* include the message about the artifact, if exists, and book
1386 * level is kinda high */ 1365 * level is kinda high */
1387 if (art->item->msg 1366 if (art->item->msg
1388 && rndm (4) + 1 < level 1367 && rndm (4) + 1 < level)
1389 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
1390 strcat (buf, art->item->msg); 1368 buf << art->item->msg;
1391 1369
1392 /* properties of the artifact */ 1370 /* properties of the artifact */
1393 tmp = object::create (); 1371 tmp = object::create ();
1394 add_abilities (tmp, art->item); 1372 add_abilities (tmp, art->item);
1395 tmp->type = type; 1373 tmp->type = type;
1396 SET_FLAG (tmp, FLAG_IDENTIFIED); 1374 SET_FLAG (tmp, FLAG_IDENTIFIED);
1397 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1375 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
1398 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1376 buf << "\rProperties of this artifact include:\r" << ch << "\n";
1377
1399 tmp->destroy (); 1378 tmp->destroy ();
1400 /* add the buf if it will fit */
1401 if (!book_overflow (retbuf, buf, booksize))
1402 strcat (retbuf, buf);
1403 else
1404 break;
1405 1379
1406 art = art->next; 1380 art = art->next;
1407 book_entries--; 1381 book_entries--;
1408 } 1382 }
1409 1383
1410#ifdef BOOK_MSG_DEBUG
1411 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf));
1412 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1413#endif
1414 return retbuf; 1384 return buf;
1415} 1385}
1416 1386
1417/***************************************************************************** 1387/*****************************************************************************
1418 * Spellpath message generation 1388 * Spellpath message generation
1419 *****************************************************************************/ 1389 *****************************************************************************/
1420 1390
1421/* spellpath_msg() - generate a message detailing the member 1391/* spellpath_msg() - generate a message detailing the member
1422 * incantations/prayers (and some of their properties) belonging to 1392 * incantations/prayers (and some of their properties) belonging to
1423 * a given spellpath. 1393 * a given spellpath.
1424 */ 1394 */
1425 1395static char *
1426char *
1427spellpath_msg (int level, int booksize) 1396spellpath_msg (int level, int booksize)
1428{ 1397{
1398 static dynbuf_text buf; buf.clear ();
1399
1429 static char retbuf[BOOK_BUF]; 1400 static char retbuf[BOOK_BUF];
1430 char tmpbuf[BOOK_BUF]; 1401 char tmpbuf[BOOK_BUF];
1431 int path = rndm (NRSPELLPATHS), prayers = rndm (2); 1402 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1432 int did_first_sp = 0;
1433 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1403 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1434 archetype *at; 1404 archetype *at;
1435 1405
1436 /* Preamble */ 1406 /* Preamble */
1437 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");
1438 1409
1439 if (path == -1) 1410 if (path == -1)
1440 strcat (retbuf, "having no known spell path.\n"); 1411 buf << " having no known spell path.\n";
1441 else 1412 else
1442 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;
1443 1416
1444 for_all_archetypes (at) 1417 for_all_archetypes (at)
1445 {
1446 /* Determine if this is an appropriate spell. Must 1418 /* Determine if this is an appropriate spell. Must
1447 * be of matching path, must be of appropriate type (prayer 1419 * be of matching path, must be of appropriate type (prayer
1448 * or not), and must be within the valid level range. 1420 * or not), and must be within the valid level range.
1449 */ 1421 */
1450 if (at->type == SPELL && at->path_attuned & pnum && 1422 if (at->type == SPELL && at->path_attuned & pnum &&
1451 ((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)))
1452 { 1424 {
1453 assign (tmpbuf, at->object::name); 1425 seen = 1;
1454 1426 buf << at->object::name << '\r';
1455 if (book_overflow (retbuf, tmpbuf, booksize))
1456 break;
1457 else
1458 {
1459 if (did_first_sp)
1460 strcat (retbuf, ",\n");
1461 did_first_sp = 1;
1462 strcat (retbuf, tmpbuf);
1463 }
1464 } 1427 }
1465 } 1428
1466 /* Geez, no spells were generated. */ 1429 /* Geez, no spells were generated. */
1467 if (!did_first_sp) 1430 if (!seen)
1468 {
1469 if (rndm (4)) /* usually, lets make a recursive call... */ 1431 if (rndm (4)) /* usually, lets make a recursive call... */
1470 spellpath_msg (level, booksize); 1432 return spellpath_msg (level, booksize);
1471 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. */
1472 strcat (retbuf, "\n - no known spells exist -\n"); 1434 buf << "- no known spells exist.\n";
1473 } 1435
1474 else
1475 {
1476 strcat (retbuf, "\n");
1477 }
1478 return retbuf; 1436 return buf;
1479} 1437}
1480 1438
1481/* formula_msg() - generate a message detailing the properties 1439/* formula_msg() - generate a message detailing the properties
1482 * of a randomly selected alchemical formula. 1440 * of a randomly selected alchemical formula.
1483 */ 1441 */
1484void 1442static void
1485make_formula_book (object *book, int level) 1443make_formula_book (object *book, int level)
1486{ 1444{
1487 char retbuf[BOOK_BUF], title[MAX_BUF]; 1445 char retbuf[BOOK_BUF], title[MAX_BUF];
1488 recipelist *fl; 1446 recipelist *fl;
1489 recipe *formula = NULL; 1447 recipe *formula = NULL;
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];
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
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 : rndm (8); 1819 msg_type = msg_type > 0 ? msg_type : rndm (8);
1862 switch (msg_type) 1820 switch (msg_type*0+2)//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 */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines