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.39 by root, Wed Dec 31 17:35:37 2008 UTC vs.
Revision 1.50 by root, Sat Oct 24 00:43:30 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 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.
… …
735} 731}
736 732
737/* init_mon_info() - creates the linked list of pointers to 733/* init_mon_info() - creates the linked list of pointers to
738 * monster archetype objects if not called previously 734 * monster archetype objects if not called previously
739 */ 735 */
740
741static void 736static void
742init_mon_info (void) 737init_mon_info ()
743{ 738{
744 archetype *at; 739 archetype *at;
745 static int did_init_mon_info = 0; 740 static int did_init_mon_info = 0;
746 741
747 if (did_init_mon_info) 742 if (did_init_mon_info)
748 return; 743 return;
749 744
750 did_init_mon_info = 1; 745 did_init_mon_info = 1;
751 746
752 for_all_archetypes (at) 747 for_all_archetypes (at)
753 { 748 if (at->flag [FLAG_MONSTER]
754 if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE))) 749 && at->is_head ()
750 && (!at->flag [FLAG_CHANGING] || at->flag [FLAG_UNAGGRESSIVE]))
755 { 751 {
756 objectlink *mon = new objectlink; 752 objectlink *mon = new objectlink;
757 753
758 mon->ob = at; 754 mon->ob = at;
759 mon->next = first_mon_info; 755 mon->next = first_mon_info;
760 first_mon_info = mon; 756 first_mon_info = mon;
761 nrofmon++; 757 nrofmon++;
762 } 758 }
763 }
764 759
765 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 760 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
766} 761}
767 762
768/* init_readable() - initialise linked lists utilized by 763/* init_readable() - initialise linked lists utilized by
… …
817 else 812 else
818 t = t->next; 813 t = t->next;
819 814
820#ifdef ARCHIVE_DEBUG 815#ifdef ARCHIVE_DEBUG
821 if (t) 816 if (t)
822 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, t->name, t->authour, t->msg_index); 817 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, &t->name, &t->authour, t->msg_index);
823#endif 818#endif
824 819
825 return t; 820 return t;
826} 821}
827 822
… …
829 * handled directly in change_book_name(). Names are based on text 824 * handled directly in change_book_name(). Names are based on text
830 * msgtype 825 * msgtype
831 * this sets book book->name based on msgtype given. What name 826 * this sets book book->name based on msgtype given. What name
832 * is given is based on various criteria 827 * is given is based on various criteria
833 */ 828 */
834
835static void 829static void
836new_text_name (object *book, int msgtype) 830new_text_name (object *book, int msgtype)
837{ 831{
838 int nbr; 832 int nbr;
839 char name[MAX_BUF]; 833 char name[MAX_BUF];
… …
975 969
976 /* We have stuff we need to write now */ 970 /* We have stuff we need to write now */
977 need_to_write_bookarchive = 1; 971 need_to_write_bookarchive = 1;
978 972
979#ifdef ARCHIVE_DEBUG 973#ifdef ARCHIVE_DEBUG
980 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", book->name, book->title, msgtype); 974 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", &book->name, &book->title, msgtype);
981#endif 975#endif
982 976
983} 977}
984 978
985 979
… …
991 * levels and architypes. -b.t. 985 * levels and architypes. -b.t.
992 */ 986 */
993 987
994#define MAX_TITLE_CHECK 20 988#define MAX_TITLE_CHECK 20
995 989
996void 990static void
997change_book (object *book, int msgtype) 991change_book (object *book, int msgtype)
998{ 992{
999 int nbr = sizeof (book_descrpt) / sizeof (char *); 993 int nbr = sizeof (book_descrpt) / sizeof (char *);
1000 994
1001 switch (book->type) 995 switch (book->type)
… …
1051 if (numb == maxnames) 1045 if (numb == maxnames)
1052 { 1046 {
1053#ifdef ARCHIVE_DEBUG 1047#ifdef ARCHIVE_DEBUG
1054 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1048 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1055#endif 1049#endif
1056 break;
1057 } 1050 }
1058 /* shouldnt change map-maker books */ 1051 /* shouldnt change map-maker books */
1059 else if (!book->title) 1052 else if (!book->title)
1060 do 1053 do
1061 { 1054 {
… …
1076 */ 1069 */
1077 1070
1078 if (tries == MAX_TITLE_CHECK || numb == maxnames) 1071 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1079 { /* got to check maxnames again */ 1072 { /* got to check maxnames again */
1080#ifdef ARCHIVE_DEBUG 1073#ifdef ARCHIVE_DEBUG
1081 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames); 1074 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
1082#endif 1075#endif
1083 /* restore old book properties here */ 1076 /* restore old book properties here */
1084 book->title = old_title; 1077 book->title = old_title;
1085 1078
1086 if (rndm (4)) 1079 if (rndm (4))
… …
1126 * list of all monsters in the current game. If level is non-zero, 1119 * list of all monsters in the current game. If level is non-zero,
1127 * then only monsters greater than that level will be returned. 1120 * then only monsters greater than that level will be returned.
1128 * Changed 971225 to be greater than equal to level passed. Also 1121 * Changed 971225 to be greater than equal to level passed. Also
1129 * made choosing by level more random. 1122 * made choosing by level more random.
1130 */ 1123 */
1131
1132object * 1124object *
1133get_random_mon (int level) 1125get_random_mon (int level)
1134{ 1126{
1135 objectlink *mon = first_mon_info; 1127 objectlink *mon = first_mon_info;
1136 int i = 0, monnr; 1128 int i = 0, monnr;
… …
1194 1186
1195/* 1187/*
1196 * Returns a description of the monster. This really needs to be 1188 * Returns a description of the monster. This really needs to be
1197 * redone, as describe_item really gives a pretty internal description. 1189 * redone, as describe_item really gives a pretty internal description.
1198 */ 1190 */
1199 1191static const char *
1200char *
1201mon_desc (const object *mon) 1192mon_desc (const object *mon)
1202{ 1193{
1203 static char retbuf[HUGE_BUF]; 1194 static dynbuf_text buf; buf.clear ();
1204 1195
1205 sprintf (retbuf, " *** %s ***\n", &mon->name); 1196 buf.printf ("B<< %s >>\r", &mon->name);
1206 strcat (retbuf, describe_item (mon, NULL)); 1197 buf << describe_item (mon, 0);
1207 1198
1208 return retbuf; 1199 return buf;
1209} 1200}
1210 1201
1211 1202
1212/* This function returns the next monsters after 'tmp'. If no match is 1203/* This function returns the next monsters after 'tmp'. If no match is
1213 * found, it returns NULL (changed 0.94.3 to do this, since the 1204 * found, it returns NULL (changed 0.94.3 to do this, since the
1214 * calling function (mon_info_msg) seems to expect that. 1205 * calling function (mon_info_msg) seems to expect that.
1215 */ 1206 */
1216 1207static object *
1217object *
1218get_next_mon (object *tmp) 1208get_next_mon (object *tmp)
1219{ 1209{
1220 objectlink *mon; 1210 objectlink *mon;
1221 1211
1222 for (mon = first_mon_info; mon; mon = mon->next) 1212 for (mon = first_mon_info; mon; mon = mon->next)
… …
1224 break; 1214 break;
1225 1215
1226 /* didn't find a match */ 1216 /* didn't find a match */
1227 if (!mon) 1217 if (!mon)
1228 return NULL; 1218 return NULL;
1219
1229 if (mon->next) 1220 if (mon->next)
1230 return mon->next->ob; 1221 return mon->next->ob;
1231 else 1222 else
1232 return first_mon_info->ob; 1223 return first_mon_info->ob;
1233 1224
1234} 1225}
1235 1226
1236
1237
1238/* mon_info_msg() - generate a message detailing the properties 1227/* mon_info_msg() - generate a message detailing the properties
1239 * of a randomly selected monster. 1228 * of a randomly selected monster.
1240 */ 1229 */
1241 1230static const char *
1242char *
1243mon_info_msg (int level, int booksize) 1231mon_info_msg (int level)
1244{ 1232{
1245 static char retbuf[BOOK_BUF]; 1233 static dynbuf_text buf; buf.clear ();
1246 char tmpbuf[HUGE_BUF];
1247 object *tmp;
1248 1234
1249 /*preamble */ 1235 /*preamble */
1250 strcpy (retbuf, "This beastiary contains:"); 1236 buf << "This beastiary contains:\n";
1251 1237
1252 /* 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
1253 * document. 1239 * document.
1254 * 8-96 Had to change this a bit, otherwise there would 1240 * 8-96 Had to change this a bit, otherwise there would
1255 * have been an impossibly large number of combinations 1241 * have been an impossibly large number of combinations
1256 * of text! (and flood out the available number of titles 1242 * of text! (and flood out the available number of titles
1257 * in the archive in a snap!) -b.t. 1243 * in the archive in a snap!) -b.t.
1258 */ 1244 */
1259 tmp = get_random_mon (level * 3); 1245 object *tmp = get_random_mon (level * 3);
1260 while (tmp) 1246 while (tmp && buf.size () < BOOK_BUF)
1261 { 1247 {
1262 /* monster description */ 1248 /* monster description */
1263 sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp)); 1249 buf.printf ("\n%s\n", mon_desc (tmp));
1264
1265 if (!book_overflow (retbuf, tmpbuf, booksize))
1266 strcat (retbuf, tmpbuf);
1267 else
1268 break;
1269 1250
1270 /* Note that the value this returns is not based on level */ 1251 /* Note that the value this returns is not based on level */
1271 tmp = get_next_mon (tmp); 1252 tmp = get_next_mon (tmp);
1272 } 1253 }
1273 1254
1274#ifdef BOOK_MSG_DEBUG
1275 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf));
1276 fprintf (logfile, " MADE THIS:\n%s\n", retbuf);
1277#endif
1278
1279 return retbuf; 1255 return buf;
1280} 1256}
1281 1257
1282 1258
1283/***************************************************************************** 1259/*****************************************************************************
1284 * Artifact msg generation code. 1260 * Artifact msg generation code.
1285 ****************************************************************************/ 1261 ****************************************************************************/
1286 1262
1287/* artifact_msg() - generate a message detailing the properties 1263/* artifact_msg() - generate a message detailing the properties
1288 * of 1-6 artifacts drawn sequentially from the artifact list. 1264 * of 1-6 artifacts drawn sequentially from the artifact list.
1289 */ 1265 */
1290const char * 1266static const char *
1291artifact_msg (int level, int booksize) 1267artifact_msg (int level)
1292{ 1268{
1293 artifactlist *al = NULL; 1269 artifactlist *al = NULL;
1294 artifact *art; 1270 artifact *art;
1295 int chance, i, type, index; 1271 int chance, i, type, index;
1296 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;
1297 const char *ch; 1273 const char *ch;
1298 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1274 char name[MAX_BUF];
1299 static char retbuf[BOOK_BUF];
1300 object *tmp = NULL; 1275 object *tmp = NULL;
1276
1277 static dynbuf_text buf; buf.clear ();
1301 1278
1302 /* values greater than 5 create msg buffers that are too big! */ 1279 /* values greater than 5 create msg buffers that are too big! */
1303 if (book_entries > 5) 1280 if (book_entries > 5)
1304 book_entries = 5; 1281 book_entries = 5;
1305 1282
… …
1334 1311
1335 /* the base 'generic' name for our artifact */ 1312 /* the base 'generic' name for our artifact */
1336 assign (name, art_name_array[index].name); 1313 assign (name, art_name_array[index].name);
1337 1314
1338 /* Ok, lets print out the contents */ 1315 /* Ok, lets print out the contents */
1339 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");
1340 1319
1341 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1320 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
1342 * 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)
1343 */ 1322 */
1344 while (book_entries > 0) 1323 while (book_entries > 0 && buf.size () < BOOK_BUF)
1345 { 1324 {
1346 1325
1347 if (art == NULL) 1326 if (!art)
1348 art = al->items; 1327 art = al->items;
1349 1328
1350 /* separator of items */ 1329 buf << '\n';
1351 strcpy (buf, "--- \n");
1352 1330
1353 /* Name */ 1331 /* Name */
1354 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1332 if (art->allowed && art->allowed->name != shstr_All)
1355 { 1333 {
1356 linked_char *temp, *next = art->allowed; 1334 linked_char *temp, *next = art->allowed;
1357 1335
1358 do 1336 do
1359 { 1337 {
1360 temp = next; 1338 temp = next;
1361 next = next->next; 1339 next = next->next;
1362 } 1340 }
1363 while (next && rndm (2)); 1341 while (next && rndm (2));
1342
1364 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);
1365 } 1344 }
1366 else /* default name is used */ 1345 else /* default name is used */
1367 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 ";
1368 1349
1369 /* chance of finding */ 1350 /* chance of finding */
1370 chance = (int) (100 * ((float) art->chance / al->total_chance)); 1351 chance = (int) (100 * ((float) art->chance / al->total_chance));
1371 if (chance >= 20) 1352 if (chance >= 20)
1372 sprintf (sbuf, "an uncommon"); 1353 buf << "an uncommon";
1373 else if (chance >= 10) 1354 else if (chance >= 10)
1374 sprintf (sbuf, "an unusual"); 1355 buf << "an unusual";
1375 else if (chance >= 5) 1356 else if (chance >= 5)
1376 sprintf (sbuf, "a rare"); 1357 buf << "a rare";
1377 else 1358 else
1378 sprintf (sbuf, "a very rare"); 1359 buf << "a very rare";
1379 sprintf (buf, "%s is %s\n", buf, sbuf);
1380 1360
1381 /* value of artifact */ 1361 /* value of artifact */
1382 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";
1383 1363
1384 /* include the message about the artifact, if exists, and book 1364 /* include the message about the artifact, if exists, and book
1385 * level is kinda high */ 1365 * level is kinda high */
1386 if (art->item->msg 1366 if (art->item->msg
1387 && rndm (4) + 1 < level 1367 && rndm (4) + 1 < level)
1388 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
1389 strcat (buf, art->item->msg); 1368 buf << art->item->msg;
1390 1369
1391 /* properties of the artifact */ 1370 /* properties of the artifact */
1392 tmp = object::create (); 1371 tmp = object::create ();
1393 add_abilities (tmp, art->item); 1372 add_abilities (tmp, art->item);
1394 tmp->type = type; 1373 tmp->type = type;
1395 SET_FLAG (tmp, FLAG_IDENTIFIED); 1374 SET_FLAG (tmp, FLAG_IDENTIFIED);
1396 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1375 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
1397 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1376 buf << "\rProperties of this artifact include:\r" << ch << "\n";
1377
1398 tmp->destroy (); 1378 tmp->destroy ();
1399 /* add the buf if it will fit */
1400 if (!book_overflow (retbuf, buf, booksize))
1401 strcat (retbuf, buf);
1402 else
1403 break;
1404 1379
1405 art = art->next; 1380 art = art->next;
1406 book_entries--; 1381 book_entries--;
1407 } 1382 }
1408 1383
1409#ifdef BOOK_MSG_DEBUG
1410 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf));
1411 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1412#endif
1413 return retbuf; 1384 return buf;
1414} 1385}
1415 1386
1416/***************************************************************************** 1387/*****************************************************************************
1417 * Spellpath message generation 1388 * Spellpath message generation
1418 *****************************************************************************/ 1389 *****************************************************************************/
1419 1390
1420/* spellpath_msg() - generate a message detailing the member 1391/* spellpath_msg() - generate a message detailing the member
1421 * incantations/prayers (and some of their properties) belonging to 1392 * incantations/prayers (and some of their properties) belonging to
1422 * a given spellpath. 1393 * a given spellpath.
1423 */ 1394 */
1424 1395static char *
1425char *
1426spellpath_msg (int level, int booksize) 1396spellpath_msg (int level)
1427{ 1397{
1398 static dynbuf_text buf; buf.clear ();
1399
1428 static char retbuf[BOOK_BUF]; 1400 static char retbuf[BOOK_BUF];
1429 char tmpbuf[BOOK_BUF]; 1401 char tmpbuf[BOOK_BUF];
1430 int path = rndm (NRSPELLPATHS), prayers = rndm (2); 1402 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1431 int did_first_sp = 0;
1432 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1403 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1433 archetype *at; 1404 archetype *at;
1434 1405
1435 /* Preamble */ 1406 /* Preamble */
1436 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");
1437 1409
1438 if (path == -1) 1410 if (path == -1)
1439 strcat (retbuf, "having no known spell path.\n"); 1411 buf << " having no known spell path.\n";
1440 else 1412 else
1441 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;
1442 1416
1443 for_all_archetypes (at) 1417 for_all_archetypes (at)
1444 {
1445 /* Determine if this is an appropriate spell. Must 1418 /* Determine if this is an appropriate spell. Must
1446 * be of matching path, must be of appropriate type (prayer 1419 * be of matching path, must be of appropriate type (prayer
1447 * or not), and must be within the valid level range. 1420 * or not), and must be within the valid level range.
1448 */ 1421 */
1449 if (at->type == SPELL && at->path_attuned & pnum && 1422 if (at->type == SPELL && at->path_attuned & pnum &&
1450 ((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)))
1451 { 1424 {
1452 assign (tmpbuf, at->object::name); 1425 seen = 1;
1453 1426 buf << at->object::name << '\r';
1454 if (book_overflow (retbuf, tmpbuf, booksize))
1455 break;
1456 else
1457 {
1458 if (did_first_sp)
1459 strcat (retbuf, ",\n");
1460 did_first_sp = 1;
1461 strcat (retbuf, tmpbuf);
1462 }
1463 } 1427 }
1464 } 1428
1465 /* Geez, no spells were generated. */ 1429 /* Geez, no spells were generated. */
1466 if (!did_first_sp) 1430 if (!seen)
1467 {
1468 if (rndm (4)) /* usually, lets make a recursive call... */ 1431 if (rndm (4)) /* usually, lets make a recursive call... */
1469 spellpath_msg (level, booksize); 1432 return spellpath_msg (level);
1470 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. */
1471 strcat (retbuf, "\n - no known spells exist -\n"); 1434 buf << "- no known spells exist.\n";
1472 } 1435
1473 else
1474 {
1475 strcat (retbuf, "\n");
1476 }
1477 return retbuf; 1436 return buf;
1478} 1437}
1479 1438
1480/* formula_msg() - generate a message detailing the properties 1439/* formula_msg() - generate a message detailing the properties
1481 * of a randomly selected alchemical formula. 1440 * of a randomly selected alchemical formula.
1482 */ 1441 */
1483void 1442static void
1484make_formula_book (object *book, int level) 1443make_formula_book (object *book, int level)
1485{ 1444{
1486 char retbuf[BOOK_BUF], title[MAX_BUF]; 1445 char title[MAX_BUF];
1487 recipelist *fl; 1446 recipelist *fl;
1488 recipe *formula = NULL; 1447 recipe *formula = NULL;
1489 int chance; 1448 int chance;
1449
1450 static dynbuf_text buf; buf.clear ();
1490 1451
1491 /* the higher the book level, the more complex (ie number of 1452 /* the higher the book level, the more complex (ie number of
1492 * ingredients) the formula can be. 1453 * ingredients) the formula can be.
1493 */ 1454 */
1494 fl = get_formulalist (rndm (level) / 3 + 1); 1455 fl = get_formulalist (rndm (level) / 3 + 1);
… …
1507 /* get a random formula, weighted by its bookchance */ 1468 /* get a random formula, weighted by its bookchance */
1508 chance = rndm (fl->total_chance); 1469 chance = rndm (fl->total_chance);
1509 for (formula = fl->items; formula; formula = formula->next) 1470 for (formula = fl->items; formula; formula = formula->next)
1510 { 1471 {
1511 chance -= formula->chance; 1472 chance -= formula->chance;
1473
1512 if (chance <= 0) 1474 if (chance <= 0)
1513 break; 1475 break;
1514 } 1476 }
1515 1477
1516 if (!formula || formula->arch_names <= 0) 1478 if (!formula || formula->arch_names <= 0)
1517 { 1479 {
1518 book->msg = "<indecipherable text>\n"; 1480 book->msg = "<indecipherable text>\n";
1519 new_text_name (book, 4); 1481 new_text_name (book, 4);
1520 add_author (book, 4); 1482 add_author (book, 4);
1521 1483 return;
1522 } 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;
1523 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);
1524 { 1514 }
1525 /* looks like a formula was found. Base the amount 1515 else
1526 * of information on the booklevel and the spellevel 1516 {
1527 * of the formula. */ 1517 buf << "The B<< " << op_name;
1528 1518
1529 const char *op_name = formula->arch_name [rndm (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;
1530 archetype *at; 1538 archetype *at;
1531 1539
1532 /* preamble */
1533 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1534
1535 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1536 op_name = at->object::name;
1537 else
1538 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1539
1540 /* item name */
1541 if (strcmp (formula->title, "NONE"))
1542 {
1543 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1544 /* This results in things like pile of philo. sulfur.
1545 * while philo. sulfur may look better, without this,
1546 * you get things like 'the wise' because its missing the
1547 * water of section.
1548 */
1549 sprintf (title, "%s: %s of %s",
1550 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1551 }
1552 else
1553 {
1554 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1555 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1556 if (at->title)
1557 {
1558 strcat (retbuf, " ");
1559 strcat (retbuf, at->title);
1560 strcat (title, " ");
1561 strcat (title, at->title);
1562 }
1563 }
1564 /* Lets name the book something meaningful ! */
1565 book->name = title;
1566 book->title = NULL;
1567
1568 /* ingredients to make it */
1569 if (formula->ingred != NULL)
1570 {
1571 linked_char *next;
1572 archetype *at;
1573
1574 at = archetype::find (formula->cauldron); 1540 at = archetype::find (formula->cauldron);
1575 1541
1576 sprintf (retbuf + strlen (retbuf), 1542 buf.printf (" may be made at %s using the following ingredients:\n\n",
1577 " 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");
1578 1544
1579 for (next = formula->ingred; next != NULL; next = next->next) 1545 for (next = formula->ingred; next; next = next->next)
1580 { 1546 buf << next->name << '\r';
1581 strcat (retbuf, next->name); 1547 }
1582 strcat (retbuf, "\n");
1583 }
1584 }
1585 else 1548 else
1586 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);
1587 if (retbuf[strlen (retbuf) - 1] != '\n')
1588 strcat (retbuf, "\n");
1589 1550
1590 book->msg = retbuf; 1551 book->msg = buf;
1591 }
1592} 1552}
1593 1553
1594#define DESCRIBE_PATH(retbuf, variable, name) \ 1554#define DESCRIBE_PATH(retbuf, variable, name) \
1595 if(variable) { \ 1555 if(variable) { \
1596 int i,j=0; \ 1556 int i,j=0; \
… …
1607 } 1567 }
1608 1568
1609/* god_info_msg() - generate a message detailing the properties 1569/* god_info_msg() - generate a message detailing the properties
1610 * of a random god. Used by the book hack. b.t. 1570 * of a random god. Used by the book hack. b.t.
1611 */ 1571 */
1612const char * 1572static const char *
1613god_info_msg (int level, int booksize) 1573god_info_msg (int level)
1614{ 1574{
1615 static char retbuf[BOOK_BUF];
1616 const char *name = NULL; 1575 const char *name = NULL;
1617 char buf[BOOK_BUF];
1618 int i;
1619 size_t introlen;
1620 object *god = pntr_to_god_obj (get_rand_god ()); 1576 object *god = pntr_to_god_obj (get_rand_god ());
1621 1577
1578 static dynbuf_text buf; buf.clear ();
1579
1622 if (!god) 1580 if (!god)
1623 return (char *) NULL; /* oops, problems... */ 1581 return 0; /* oops, problems... */
1582
1624 name = god->name; 1583 name = god->name;
1625 1584
1626 /* preamble.. */ 1585 /* preamble.. */
1627 sprintf (retbuf, "This document contains knowledge concerning\n"); 1586 buf << "This document contains knowledge concerning the diety B<< "
1628 sprintf (retbuf, "%sthe diety %s", retbuf, name); 1587 << name << " >>";
1629 1588
1630 /* Always have as default information the god's descriptive terms. */ 1589 /* Always have as default information the god's descriptive terms. */
1631 if (nstrtok (god->msg, ",") > 0) 1590 if (nstrtok (god->msg, ",") > 0)
1632 { 1591 buf << ", known as" << strtoktolin (god->msg, ",");
1633 strcat (retbuf, ", known as");
1634 strcat (retbuf, strtoktolin (god->msg, ","));
1635 }
1636 else 1592 else
1637 strcat (retbuf, "..."); 1593 buf << "...";
1638 1594
1639 strcat (retbuf, "\n ---\n"); 1595 buf << "\n\n";
1596
1640 introlen = strlen (retbuf); /* so we will know if no new info is added later */ 1597 int introlen = buf.size (); /* so we will know if no new info is added later */
1641 1598
1642 /* Information about the god is random, and based on the level of the 1599 /* Information about the god is random, and based on the level of the
1643 * 'book'. Probably there is a more intellegent way to implement 1600 * 'book'. Probably there is a more intellegent way to implement
1644 * this ... 1601 * this ...
1645 */ 1602 */
1646 while (level > 0) 1603 while (level > 0 && buf.size () < BOOK_BUF)
1647 { 1604 {
1648 sprintf (buf, " ");
1649 if (level == 2 && rndm (2)) 1605 if (level == 2 && rndm (2))
1650 { /* enemy god */ 1606 { /* enemy god */
1651 const char *enemy = god->title; 1607 const char *enemy = god->title;
1652 1608
1653 if (enemy) 1609 if (enemy)
1654 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1610 buf.printf ("The gods %s and %s are enemies.\r", name, enemy);
1655 } 1611 }
1656 1612
1657 if (level == 3 && rndm (2)) 1613 if (level == 3 && rndm (2))
1658 { /* enemy race, what the god's holy word effects */ 1614 { /* enemy race, what the god's holy word effects */
1659 const char *enemy = god->slaying; 1615 const char *enemy = god->slaying;
1616 int i;
1660 1617
1661 if (enemy && !(god->path_denied & PATH_TURNING)) 1618 if (enemy && !(god->path_denied & PATH_TURNING))
1662 if ((i = nstrtok (enemy, ",")) > 0) 1619 if ((i = nstrtok (enemy, ",")) > 0)
1663 { 1620 {
1664 char tmpbuf[MAX_BUF]; 1621 char tmpbuf[MAX_BUF];
1665 1622
1666 sprintf (buf, "The holy words of %s have the power to\n", name); 1623 buf << "The holy words of " << name
1667 strcat (buf, "slay creatures belonging to the "); 1624 << " have the power to slay creatures belonging to the ";
1625
1668 if (i > 1) 1626 if (i > 1)
1669 sprintf (tmpbuf, "following \n races:%s", strtoktolin (enemy, ",")); 1627 buf << "following races:" << strtoktolin (enemy, ",");
1670 else 1628 else
1671 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1629 buf << "race of" << strtoktolin (enemy, ",");
1672 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1630
1631 buf << '\r';
1673 } 1632 }
1674 } 1633 }
1675 1634
1676 if (level == 4 && rndm (2)) 1635 if (level == 4 && rndm (2))
1677 { /* Priest of god gets these protect,vulnerable... */ 1636 { /* Priest of god gets these protect,vulnerable... */
1678 char tmpbuf[MAX_BUF];
1679
1680 if (const char *cp = describe_resistance (god, 1)) 1637 if (const char *cp = describe_resistance (god, 1))
1681 { /* This god does have protections */ 1638 { /* This god does have protections */
1682 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1639 buf << name
1640 << " has a potent aura which is extended to"
1683 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1641 " faithful priests. The effects of this aura include: "
1684 strcat (tmpbuf, cp); 1642 << cp
1685 strcat (buf, tmpbuf); 1643 << ".\r";
1686 strcat (buf, "\n ---\n");
1687 } 1644 }
1688 else
1689 sprintf (buf, " ");
1690 } 1645 }
1691 1646
1692 if (level == 5 && rndm (2)) 1647 if (level == 5 && rndm (2))
1693 { /* aligned race, summoning */ 1648 { /* aligned race, summoning */
1694 const char *race = god->race; /* aligned race */ 1649 const char *race = god->race; /* aligned race */
1650 int i;
1695 1651
1696 if (race && !(god->path_denied & PATH_SUMMON)) 1652 if (race && !(god->path_denied & PATH_SUMMON))
1697 if ((i = nstrtok (race, ",")) > 0) 1653 if ((i = nstrtok (race, ",")) > 0)
1698 { 1654 {
1699 char tmpbuf[MAX_BUF]; 1655 buf << "Creatures sacred to " << name << " include the ";
1700
1701 sprintf (buf, "Creatures sacred to %s include the \n", name);
1702 if (i > 1) 1656 if (i > 1)
1703 sprintf (tmpbuf, "following \n races:%s", strtoktolin (race, ",")); 1657 buf << "following races:" << strtoktolin (race, ",");
1704 else 1658 else
1705 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1659 buf << "race of" << strtoktolin (race, ",");
1706 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1660
1661 buf << '\r';
1707 } 1662 }
1708 } 1663 }
1709 1664
1710 if (level == 6 && rndm (2)) 1665 if (level == 6 && rndm (2))
1711 { /* blessing,curse properties of the god */ 1666 { /* blessing,curse properties of the god */
1712 char tmpbuf[MAX_BUF];
1713
1714 if (const char *cp = describe_resistance (god, 1)) 1667 if (const char *cp = describe_resistance (god, 1))
1715 { /* This god does have protections */ 1668 { /* This god does have protections */
1716 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name); 1669 buf << "The priests of " << name
1670 << " are known to be able to "
1717 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1671 "bestow a blessing which makes the recipient "
1718 strcat (tmpbuf, cp); 1672 << cp
1719 strcat (buf, tmpbuf); 1673 << '\r';
1720 strcat (buf, "\n ---\n");
1721 } 1674 }
1722 else
1723 sprintf (buf, " ");
1724
1725 } 1675 }
1726 1676
1727 if (level == 8 && rndm (2)) 1677 if (level == 8 && rndm (2))
1728 { /* immunity, holy possession */ 1678 { /* immunity, holy possession */
1729 int has_effect = 0, tmpvar; 1679 buf << "The priests of " << name
1730 char tmpbuf[MAX_BUF]; 1680 << " are known to make cast a mighty"
1681 " prayer of possession";
1682
1683 int first = 1;
1731 1684
1732 sprintf (tmpbuf, "\n");
1733 sprintf (tmpbuf, "The priests of %s are known to make cast a mighty \n", name);
1734
1735 strcat (tmpbuf, "prayer of possession which gives the recipient\n");
1736
1737 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++) 1685 for (int i = 0; i < NROFATTACKS; i++)
1686 if (god->resist[i] == 100)
1738 { 1687 {
1739 if (god->resist[tmpvar] == 100) 1688 if (first)
1740 { 1689 {
1690 buf << " which gives the recipient";
1741 has_effect = 1; 1691 first = 0;
1742 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1743 } 1692 }
1693 else
1694 buf << ", ";
1695
1696 buf << " immunity to " << attacktype_desc[i];
1744 } 1697 }
1745 1698
1746 if (has_effect) 1699 buf << ".\r";
1747 {
1748 strcat (buf, tmpbuf);
1749 strcat (buf, "\n ---\n");
1750 }
1751 else
1752 sprintf (buf, " ");
1753 } 1700 }
1754 1701
1755 if (level == 12 && rndm (2)) 1702 if (level == 12 && rndm (2))
1756 { /* spell paths */ 1703 { /* spell paths */
1704 //TODO:
1757 int has_effect = 0, tmpvar; 1705 int has_effect = 0, tmpvar;
1758 char tmpbuf[MAX_BUF]; 1706 char tmpbuf[MAX_BUF];
1759 1707
1760 sprintf (tmpbuf, "\n"); 1708 sprintf (tmpbuf, "\n");
1761 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1709 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
… …
1778 has_effect = 1; 1726 has_effect = 1;
1779 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1727 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1780 } 1728 }
1781 1729
1782 if (has_effect) 1730 if (has_effect)
1783 { 1731 buf << tmpbuf << '\r';
1784 strcat (buf, tmpbuf);
1785 strcat (buf, "\n ---\n");
1786 }
1787 else 1732 else
1788 sprintf (buf, " "); 1733 buf << '\r';
1789 } 1734 }
1790 1735
1791 /* check to be sure new buffer size dont exceed either
1792 * the maximum buffer size, or the 'natural' size of the
1793 * book...
1794 */
1795 if (book_overflow (retbuf, buf, booksize))
1796 break;
1797 else if (strlen (buf) > 1)
1798 strcat (retbuf, buf);
1799
1800 level--; 1736 level--;
1801 } 1737 }
1802 1738
1803 if (strlen (retbuf) == introlen) 1739 if (buf.size () == introlen)
1804 { /* we got no information beyond the preamble! */ 1740 /* we got no information beyond the preamble! */
1805 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1741 buf << "[Unfortunately the rest of the information is hopelessly garbled!]";
1806 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1742
1807 }
1808#ifdef BOOK_MSG_DEBUG
1809 LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf));
1810 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1811#endif
1812 return retbuf; 1743 return buf;
1813} 1744}
1814 1745
1815/* tailor_readable_ob()- The main routine. This chooses a random 1746/* tailor_readable_ob()- The main routine. This chooses a random
1816 * message to put in given readable object (type==BOOK) which will 1747 * message to put in given readable object (type==BOOK) which will
1817 * be referred hereafter as a 'book'. We use the book level to de- 1748 * be referred hereafter as a 'book'. We use the book level to de-
… …
1829 * 1760 *
1830 */ 1761 */
1831void 1762void
1832tailor_readable_ob (object *book, int msg_type) 1763tailor_readable_ob (object *book, int msg_type)
1833{ 1764{
1834 char msgbuf[BOOK_BUF];
1835 int level = book->level ? rndm (book->level) + 1 : 1; 1765 int level = book->level ? rndm (book->level) + 1 : 1;
1836 int book_buf_size;
1837 1766
1838 /* safety */ 1767 /* safety */
1839 if (book->type != BOOK) 1768 if (book->type != BOOK)
1840 return; 1769 return;
1841 1770
1842 if (level <= 0) 1771 if (level <= 0)
1843 return; /* if no level no point in doing any more... */ 1772 return; /* if no level no point in doing any more... */
1844
1845 /* Max text length this book can have. */
1846 book_buf_size = BOOKSIZE (book);
1847 1773
1848 /* &&& The message switch &&& */ 1774 /* &&& The message switch &&& */
1849 /* Below all of the possible types of messages in the "book"s. 1775 /* Below all of the possible types of messages in the "book"s.
1850 */ 1776 */
1851 /* 1777 /*
… …
1854 * 2) make sure there is an entry in max_titles[] array. 1780 * 2) make sure there is an entry in max_titles[] array.
1855 * 3) make sure there are entries for your case in new_text_title() 1781 * 3) make sure there are entries for your case in new_text_title()
1856 * and add_authour(). 1782 * and add_authour().
1857 * 4) you may want separate authour/book name arrays in read.h 1783 * 4) you may want separate authour/book name arrays in read.h
1858 */ 1784 */
1785 const char *new_msg = "";
1859 msg_type = msg_type > 0 ? msg_type : rndm (8); 1786 msg_type = msg_type > 0 ? msg_type : rndm (8);
1860 switch (msg_type) 1787 switch (msg_type)
1861 { 1788 {
1862 case 1: /* monster attrib */ 1789 case 1: /* monster attrib */
1863 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1790 new_msg = mon_info_msg (level);
1864 break; 1791 break;
1865 case 2: /* artifact attrib */ 1792 case 2: /* artifact attrib */
1866 strcpy (msgbuf, artifact_msg (level, book_buf_size)); 1793 new_msg = artifact_msg (level);
1867 break; 1794 break;
1868 case 3: /* grouping incantations/prayers by path */ 1795 case 3: /* grouping incantations/prayers by path */
1869 strcpy (msgbuf, spellpath_msg (level, book_buf_size)); 1796 new_msg = spellpath_msg (level);
1870 break; 1797 break;
1871 case 4: /* describe an alchemy formula */ 1798 case 4: /* describe an alchemy formula */
1872 make_formula_book (book, level); 1799 make_formula_book (book, level);
1873 /* make_formula_book already gives title */ 1800 /* make_formula_book already gives title */
1874 return; 1801 return;
1875 break;
1876 case 5: /* bits of information about a god */ 1802 case 5: /* bits of information about a god */
1877 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1803 new_msg = god_info_msg (level);
1878 break; 1804 break;
1879 case 0: /* use info list in lib/ */ 1805 case 0: /* use info list in lib/ */
1880 default: 1806 default:
1881 cfperl_make_book (book, level); 1807 cfperl_make_book (book, level);
1808 /* already gives title */
1882 return; 1809 return;
1883 } 1810 }
1884 1811
1885 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1886
1887 if (strlen (msgbuf) > 1) 1812 if (strlen (new_msg) > 1)
1888 { 1813 {
1889 book->msg = msgbuf; 1814 book->msg = new_msg;
1890 /* lets give the "book" a new name, which may be a compound word */ 1815 /* lets give the "book" a new name, which may be a compound word */
1891 change_book (book, msg_type); 1816 change_book (book, msg_type);
1892 } 1817 }
1893} 1818}
1894
1895 1819
1896/***************************************************************************** 1820/*****************************************************************************
1897 * 1821 *
1898 * Cleanup routine for readble stuff. 1822 * Cleanup routine for readble stuff.
1899 * 1823 *
1900 *****************************************************************************/ 1824 *****************************************************************************/
1901
1902void 1825void
1903free_all_readable (void) 1826free_all_readable (void)
1904{ 1827{
1905 titlelist *tlist, *tnext; 1828 titlelist *tlist, *tnext;
1906 title *title1, *titlenext; 1829 title *title1, *titlenext;
1907 linked_char *lmsg, *nextmsg; 1830 linked_char *lmsg, *nextmsg;
1908 objectlink *monlink, *nextmon; 1831 objectlink *monlink, *nextmon;
1909 1832
1910 LOG (llevDebug, "freeing all book information\n"); 1833 LOG (llevDebug, "freeing all book information\n");
1911 1834
1912 for (tlist = booklist; tlist != NULL; tlist = tnext) 1835 for (tlist = booklist; tlist; tlist = tnext)
1913 { 1836 {
1914 tnext = tlist->next; 1837 tnext = tlist->next;
1915 1838
1916 for (title1 = tlist->first_book; title1; title1 = titlenext) 1839 for (title1 = tlist->first_book; title1; title1 = titlenext)
1917 { 1840 {
… …
1933 nextmon = monlink->next; 1856 nextmon = monlink->next;
1934 delete monlink; 1857 delete monlink;
1935 } 1858 }
1936} 1859}
1937 1860
1938
1939/***************************************************************************** 1861/*****************************************************************************
1940 * 1862 *
1941 * Writeback routine for updating the bookarchive. 1863 * Writeback routine for updating the bookarchive.
1942 * 1864 *
1943 ****************************************************************************/ 1865 ****************************************************************************/
1944
1945/* write_book_archive() - write out the updated book archive */ 1866/* write_book_archive() - write out the updated book archive */
1946
1947void 1867void
1948write_book_archive (void) 1868write_book_archive (void)
1949{ 1869{
1950 FILE *fp; 1870 FILE *fp;
1951 int index = 0; 1871 int index = 0;
… …
1954 titlelist *bl = get_titlelist (0); 1874 titlelist *bl = get_titlelist (0);
1955 1875
1956 /* If nothing changed, don't write anything */ 1876 /* If nothing changed, don't write anything */
1957 if (!need_to_write_bookarchive) 1877 if (!need_to_write_bookarchive)
1958 return; 1878 return;
1879
1959 need_to_write_bookarchive = 0; 1880 need_to_write_bookarchive = 0;
1960 1881
1961 sprintf (fname, "%s/bookarch", settings.localdir); 1882 sprintf (fname, "%s/bookarch", settings.localdir);
1962 LOG (llevDebug, "Updating book archive: %s...\n", fname); 1883 LOG (llevDebug, "Updating book archive: %s...\n", fname);
1963 1884
1964 if ((fp = fopen (fname, "w")) == NULL) 1885 if ((fp = fopen (fname, "w")) == NULL)
1965 {
1966 LOG (llevDebug, "Can't open book archive file %s\n", fname); 1886 LOG (llevDebug, "Can't open book archive file %s\n", fname);
1967 }
1968 else 1887 else
1969 { 1888 {
1970 while (bl) 1889 while (bl)
1971 { 1890 {
1972 for (book = bl->first_book; book; book = book->next) 1891 for (book = bl->first_book; book; book = book->next)
… …
1979 fprintf (fp, "type %d\n", index); 1898 fprintf (fp, "type %d\n", index);
1980 fprintf (fp, "size %d\n", book->size); 1899 fprintf (fp, "size %d\n", book->size);
1981 fprintf (fp, "index %d\n", book->msg_index); 1900 fprintf (fp, "index %d\n", book->msg_index);
1982 fprintf (fp, "end\n"); 1901 fprintf (fp, "end\n");
1983 } 1902 }
1903
1984 bl = bl->next; 1904 bl = bl->next;
1985 index++; 1905 index++;
1986 } 1906 }
1907
1987 fclose (fp); 1908 fclose (fp);
1988 chmod (fname, SAVE_MODE); 1909 chmod (fname, SAVE_MODE);
1989 } 1910 }
1990} 1911}
1912
1991readable_message_type * 1913readable_message_type *
1992get_readable_message_type (object *readable) 1914get_readable_message_type (object *readable)
1993{ 1915{
1994 uint8 subtype = readable->subtype; 1916 uint8 subtype = readable->subtype;
1995 1917

Diff Legend

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