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.50 by root, Sat Oct 24 00:43:30 2009 UTC vs.
Revision 1.65 by root, Mon Oct 29 23:55:52 2012 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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25/* This file contains code relevant to the BOOKS hack -- designed 25/* This file contains code relevant to the BOOKS hack -- designed
26 * to allow randomly occuring messages in non-magical texts. 26 * to allow randomly occuring messages in non-magical texts.
… …
108/* these are needed for creation of a linked list of 108/* these are needed for creation of a linked list of
109 * pointers to all (hostile) monster objects */ 109 * pointers to all (hostile) monster objects */
110 110
111static int nrofmon = 0, need_to_write_bookarchive = 0; 111static int nrofmon = 0, need_to_write_bookarchive = 0;
112 112
113
114/* this is needed to keep track of status of initialisation
115 * of the message file */
116static int nrofmsg = 0;
117
118/* first_msg is the started of the linked list of messages as read from
119 * the messages file
120 */
121static linked_char *first_msg = NULL;
122
123/* 113/*
124 * Spellpath information 114 * Spellpath information
125 */ 115 */
126
127static uint32 spellpathdef[NRSPELLPATHS] = { 116static uint32 spellpathdef[NRSPELLPATHS] = {
128 PATH_PROT, 117 PATH_PROT,
129 PATH_FIRE, 118 PATH_FIRE,
130 PATH_FROST, 119 PATH_FROST,
131 PATH_ELEC, 120 PATH_ELEC,
… …
412static const char *const book_descrpt[] = { 401static const char *const book_descrpt[] = {
413 "ancient", 402 "ancient",
414 "cryptic", 403 "cryptic",
415 "cryptical", 404 "cryptical",
416 "dusty", 405 "dusty",
417 "hiearchical", 406 "hierarchical",
418 "grizzled", 407 "grizzled",
419 "gold-guilt", 408 "gold-guilt",
420 "great", 409 "great",
421 "lost", 410 "lost",
422 "magnificent", 411 "magnificent",
… …
497 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"}, 486 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"},
498 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"}, 487 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"}, 488 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"} 489 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
501}; 490};
502int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 491static int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
503 492
504static int max_titles[6] = { 493static int max_titles[6] = {
505 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)), 494 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)),
506 (sizeof (mon_book_name) / sizeof (char *)) * (sizeof (mon_author) / sizeof (char *)), 495 (sizeof (mon_book_name) / sizeof (char *)) * (sizeof (mon_author) / sizeof (char *)),
507 (sizeof (art_book_name) / sizeof (char *)) * (sizeof (art_author) / sizeof (char *)), 496 (sizeof (art_book_name) / sizeof (char *)) * (sizeof (art_author) / sizeof (char *)),
… …
515 * Start of misc. readable functions used by others functions in this file 504 * Start of misc. readable functions used by others functions in this file
516 * 505 *
517 *****************************************************************************/ 506 *****************************************************************************/
518 507
519static titlelist * 508static titlelist *
520get_empty_booklist (void) 509get_empty_booklist ()
521{ 510{
522 titlelist *bl = new titlelist; 511 titlelist *bl = new titlelist;
523 512
524 bl->number = 0; 513 bl->number = 0;
525 bl->first_book = NULL; 514 bl->first_book = NULL;
526 bl->next = NULL; 515 bl->next = NULL;
527 return bl; 516 return bl;
528} 517}
529 518
530static title * 519static title *
531get_empty_book (void) 520get_empty_book ()
532{ 521{
533 title *t = new title; 522 title *t = new title;
534 523
535 t->name = NULL; 524 t->name = NULL;
536 t->archname = NULL; 525 t->archname = NULL;
… …
545/* get_titlelist() - returns pointer to the title list referanced by i */ 534/* get_titlelist() - returns pointer to the title list referanced by i */
546 535
547static titlelist * 536static titlelist *
548get_titlelist (int i) 537get_titlelist (int i)
549{ 538{
539 if (!booklist)
540 booklist = get_empty_booklist ();
541
550 titlelist *tl = booklist; 542 titlelist *tl = booklist;
551 int number = i; 543 int number = i;
552 544
553 if (number < 0) 545 if (number < 0)
554 return tl; 546 return tl;
… …
557 { 549 {
558 if (!tl->next) 550 if (!tl->next)
559 tl->next = get_empty_booklist (); 551 tl->next = get_empty_booklist ();
560 552
561 tl = tl->next; 553 tl = tl->next;
562 number--; 554 --number;
563 } 555 }
564 556
565 return tl; 557 return tl;
566} 558}
567 559
… …
577 char *tbuf, sbuf[12], buf[MAX_BUF]; 569 char *tbuf, sbuf[12], buf[MAX_BUF];
578 int number = 0; 570 int number = 0;
579 571
580 if (!buf1 || !buf2) 572 if (!buf1 || !buf2)
581 return 0; 573 return 0;
582 sprintf (buf, "%s", buf1); 574
583 sprintf (sbuf, "%s", buf2); 575 strcpy (buf, buf1);
576 strcpy (sbuf, buf2);
577
584 tbuf = strtok (buf, sbuf); 578 tbuf = strtok (buf, sbuf);
585 while (tbuf) 579 while (tbuf)
586 { 580 {
587 number++; 581 number++;
588 tbuf = strtok (NULL, sbuf); 582 tbuf = strtok (NULL, sbuf);
… …
607 strcpy (rbuf, " "); 601 strcpy (rbuf, " ");
608 tbuf = strtok (buf, sbuf); 602 tbuf = strtok (buf, sbuf);
609 while (tbuf && i > 0) 603 while (tbuf && i > 0)
610 { 604 {
611 strcat (rbuf, tbuf); 605 strcat (rbuf, tbuf);
606
612 i--; 607 i--;
613 if (i == 1 && maxi > 1) 608 if (i == 1 && maxi > 1)
614 strcat (rbuf, " and "); 609 strcat (rbuf, " and ");
615 else if (i > 0 && maxi > 1) 610 else if (i > 0 && maxi > 1)
616 strcat (rbuf, ", "); 611 strcat (rbuf, ", ");
617 else 612 else
618 strcat (rbuf, "."); 613 strcat (rbuf, ".");
614
619 tbuf = strtok (NULL, sbuf); 615 tbuf = strtok (NULL, sbuf);
620 } 616 }
621 return (char *) rbuf;
622}
623 617
624static int
625book_overflow (const char *buf1, const char *buf2, int booksize)
626{
627 if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */
628 || buf_overflow (buf1, buf2, booksize))
629 return 1;
630
631 return 0; 618 return rbuf;
632} 619}
633 620
634/***************************************************************************** 621/*****************************************************************************
635 * 622 *
636 * Start of initialisation related functions. 623 * Start of initialisation related functions.
… …
640/* init_book_archive() - if not called before, initialise the info list 627/* init_book_archive() - if not called before, initialise the info list
641 * This reads in the bookarch file into memory. bookarch is the file 628 * This reads in the bookarch file into memory. bookarch is the file
642 * created and updated across multiple runs of the program. 629 * created and updated across multiple runs of the program.
643 */ 630 */
644static void 631static void
645init_book_archive (void) 632init_book_archive ()
646{ 633{
647 FILE *fp;
648 int comp, nroftitle = 0; 634 int nroftitle = 0;
649 char buf[MAX_BUF], fname[MAX_BUF], *cp;
650 title *book = NULL;
651 titlelist *bl = get_empty_booklist (); 635 titlelist *bl = get_empty_booklist ();
652 static int did_init_barch;
653 636
654 if (did_init_barch) 637 object_thawer thawer (settings.localdir, "bookarch");
638
639 if (!thawer)
640 {
641 LOG (llevDebug, "could not read bookarch file\n");
655 return; 642 return;
656
657 did_init_barch = 1;
658
659 if (!booklist)
660 booklist = bl;
661
662 sprintf (fname, "%s/bookarch", settings.localdir);
663 LOG (llevDebug, " Reading bookarch from %s...\n", fname);
664
665 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
666 { 643 }
644
645 while (thawer.kw)
646 {
647 if (thawer.kw != KW_title)
648 if (!thawer.parse_error ("bookarch file"))
649 break;
650
651 title *book = get_empty_book (); /* init new book entry */
652 thawer.get (book->name);
653
667 int value, type = 0; 654 int type = -1;
668 size_t i;
669 655
670 while (fgets (buf, MAX_BUF, fp) != NULL) 656 for (;;)
671 { 657 {
672 if (*buf == '#') 658 thawer.next ();
673 continue; 659
674 if ((cp = strchr (buf, '\n')) != NULL) 660 switch (thawer.kw)
675 *cp = '\0';
676 cp = buf;
677 while (*cp == ' ') /* Skip blanks */
678 cp++;
679 if (!strncmp (cp, "title", 4))
680 { 661 {
681 book = get_empty_book (); /* init new book entry */ 662 case KW_type: thawer.get (type ); break;
682 book->name = strchr (cp, ' ') + 1; 663 case KW_authour: thawer.get (book->authour ); break;
683 type = -1; 664 case KW_arch: thawer.get (book->archname ); break;
684 nroftitle++; 665 case KW_level: thawer.get (book->level ); break;
685 continue; 666 case KW_size: thawer.get (book->size ); break;
686 } 667 case KW_index: thawer.get (book->msg_index); break;
687 if (!strncmp (cp, "authour", 4)) 668
688 { 669 case KW_end:
689 book->authour = strchr (cp, ' ') + 1;
690 }
691 if (!strncmp (cp, "arch", 4))
692 {
693 book->archname = strchr (cp, ' ') + 1;
694 }
695 else if (sscanf (cp, "level %d", &value))
696 {
697 book->level = (uint16) value;
698 }
699 else if (sscanf (cp, "type %d", &value))
700 {
701 type = (uint16) value;
702 }
703 else if (sscanf (cp, "size %d", &value))
704 {
705 book->size = (uint16) value;
706 }
707 else if (sscanf (cp, "index %d", &value))
708 {
709 book->msg_index = (uint16) value;
710 }
711 else if (!strncmp (cp, "end", 3))
712 { /* link it */ 670 /* link it */
713 bl = get_titlelist (type); 671 bl = get_titlelist (type);
714 book->next = bl->first_book; 672 book->next = bl->first_book;
715 bl->first_book = book; 673 bl->first_book = book;
716 bl->number++; 674 bl->number++;
675 ++nroftitle;
676 goto book_done;
677
678 default:
679 delete book;
680 goto book_done;
717 } 681 }
718 } 682 }
683
684book_done:
685 thawer.next ();
686 }
687
719 LOG (llevDebug, "book archives(used/avail): \n"); 688 LOG (llevDebug, "book archives(used/avail): \n");
689 int i;
720 for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++) 690 for (bl = booklist, i = 0; bl && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++)
721 {
722 LOG (llevDebug, " (%d/%d)\n", bl->number, max_titles[i]); 691 LOG (llevDebug, " (%d/%d)\n", bl->number, max_titles[i]);
723 }
724 close_and_delete (fp, comp);
725 }
726 692
727#ifdef BOOK_MSG_DEBUG
728 LOG (llevDebug, "init_book_archive() got %d titles.\n", nroftitle); 693 LOG (llevDebug, "init_book_archive() got %d titles.\n", nroftitle);
729#endif
730 LOG (llevDebug, " done.\n");
731} 694}
732 695
733/* init_mon_info() - creates the linked list of pointers to 696/* init_mon_info() - creates the linked list of pointers to
734 * monster archetype objects if not called previously 697 * monster archetype objects if not called previously
735 */ 698 */
… …
765 * 728 *
766 * This is the function called by the main routine to initialise 729 * This is the function called by the main routine to initialise
767 * all the readable information. 730 * all the readable information.
768 */ 731 */
769void 732void
770init_readable (void) 733init_readable ()
771{ 734{
772 static int did_this; 735 static int did_this;
773 736
774 if (did_this) 737 if (did_this)
775 return; 738 return;
… …
827 * is given is based on various criteria 790 * is given is based on various criteria
828 */ 791 */
829static void 792static void
830new_text_name (object *book, int msgtype) 793new_text_name (object *book, int msgtype)
831{ 794{
832 int nbr; 795 const char *name;
833 char name[MAX_BUF];
834 796
835 if (book->type != BOOK) 797 if (book->type != BOOK)
836 return; 798 return;
837 799
838 switch (msgtype) 800 switch (msgtype)
839 { 801 {
840 case 1: /*monster */ 802 case 1: /*monster */
841 nbr = sizeof (mon_book_name) / sizeof (char *); 803 name = mon_book_name[rndm (array_length (mon_book_name))];
842 assign (name, mon_book_name[rndm (nbr)]);
843 break; 804 break;
844 case 2: /*artifact */ 805 case 2: /*artifact */
845 nbr = sizeof (art_book_name) / sizeof (char *); 806 name = art_book_name[rndm (array_length (art_book_name))];
846 assign (name, art_book_name[rndm (nbr)]);
847 break; 807 break;
848 case 3: /*spellpath */ 808 case 3: /*spellpath */
849 nbr = sizeof (path_book_name) / sizeof (char *); 809 name = path_book_name[rndm (array_length (path_book_name))];
850 assign (name, path_book_name[rndm (nbr)]);
851 break; 810 break;
852 case 4: /*alchemy */ 811 case 4: /*alchemy */
853 nbr = sizeof (formula_book_name) / sizeof (char *); 812 name = formula_book_name[rndm (array_length (formula_book_name))];
854 assign (name, formula_book_name[rndm (nbr)]);
855 break; 813 break;
856 case 5: /*gods */ 814 case 5: /*gods */
857 nbr = sizeof (gods_book_name) / sizeof (char *); 815 name = gods_book_name[rndm (array_length (gods_book_name))];
858 assign (name, gods_book_name[rndm (nbr)]);
859 break; 816 break;
860 case 6: /*msg file */ 817 case 6: /*msg file */
861 default: 818 default:
862 if (book->weight > 2000) 819 if (book->weight > 2000)
863 { /* based on weight */ 820 { /* based on weight */
864 nbr = sizeof (heavy_book_name) / sizeof (char *); 821 name = heavy_book_name[rndm (array_length (heavy_book_name))];
865 assign (name, heavy_book_name[rndm (nbr)]);
866 } 822 }
867 else if (book->weight < 2001) 823 else if (book->weight < 2001)
868 { 824 {
869 nbr = sizeof (light_book_name) / sizeof (char *); 825 name = light_book_name[rndm (array_length (light_book_name))];
870 assign (name, light_book_name[rndm (nbr)]);
871 } 826 }
872 break; 827 break;
873 } 828 }
874 829
875 book->name = name; 830 book->name = name;
… …
881 */ 836 */
882 837
883static void 838static void
884add_author (object *op, int msgtype) 839add_author (object *op, int msgtype)
885{ 840{
886 char title[MAX_BUF], name[MAX_BUF]; 841 const char *name;
887 int nbr = sizeof (book_author) / sizeof (char *);
888 842
889 if (msgtype < 0 || strlen (op->msg) < 5) 843 if (msgtype < 0 || strlen (op->msg) < 5)
890 return; 844 return;
891 845
892 switch (msgtype) 846 switch (msgtype)
893 { 847 {
894 case 1: /* monster */ 848 case 1: /* monster */
895 nbr = sizeof (mon_author) / sizeof (char *); 849 name = mon_author[rndm (array_length (mon_author))];
896 assign (name, mon_author[rndm (nbr)]);
897 break; 850 break;
898 case 2: /* artifacts */ 851 case 2: /* artifacts */
899 nbr = sizeof (art_author) / sizeof (char *); 852 name = art_author[rndm (array_length (art_author))];
900 assign (name, art_author[rndm (nbr)]);
901 break; 853 break;
902 case 3: /* spellpath */ 854 case 3: /* spellpath */
903 nbr = sizeof (path_author) / sizeof (char *); 855 name = path_author[rndm (array_length (path_author))];
904 assign (name, path_author[rndm (nbr)]);
905 break; 856 break;
906 case 4: /* alchemy */ 857 case 4: /* alchemy */
907 nbr = sizeof (formula_author) / sizeof (char *); 858 name = formula_author[rndm (array_length (formula_author))];
908 assign (name, formula_author[rndm (nbr)]);
909 break; 859 break;
910 case 5: /* gods */ 860 case 5: /* gods */
911 nbr = sizeof (gods_author) / sizeof (char *); 861 name = gods_author[rndm (array_length (gods_author))];
912 assign (name, gods_author[rndm (nbr)]);
913 break; 862 break;
914 case 6: /* msg file */ 863 case 6: /* msg file */
915 default: 864 default:
916 assign (name, book_author[rndm (nbr)]); 865 name = book_author[rndm (array_length (book_author))];
917 } 866 }
918 867
919 sprintf (title, "of %s", name); 868 op->title = format ("of %s", name);
920 op->title = title;
921} 869}
922 870
923/* unique_book() - check to see if the book title/msg is unique. We 871/* unique_book() - check to see if the book title/msg is unique. We
924 * go through the entire list of possibilities each time. If we find 872 * go through the entire list of possibilities each time. If we find
925 * a match, then unique_book returns true (because inst unique). 873 * a match, then unique_book returns true (because inst unique).
… …
1007 */ 955 */
1008 956
1009 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 957 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1010 { 958 {
1011 /* alter book properties */ 959 /* alter book properties */
1012 if (object *tmpbook = get_archetype (t->archname)) 960 if (object *tmpbook = archetype::get (t->archname))
1013 { 961 {
1014 tmpbook->msg = book->msg; 962 tmpbook->msg = book->msg;
1015 tmpbook->copy_to (book); 963 tmpbook->copy_to (book);
1016 tmpbook->destroy (); 964 tmpbook->destroy ();
1017 } 965 }
… …
1075#endif 1023#endif
1076 /* restore old book properties here */ 1024 /* restore old book properties here */
1077 book->title = old_title; 1025 book->title = old_title;
1078 1026
1079 if (rndm (4)) 1027 if (rndm (4))
1080 {
1081 /* Lets give the book a description to individualize it some */ 1028 /* Lets give the book a description to individualize it some */
1082 char new_name[MAX_BUF];
1083
1084 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name); 1029 book->name = format ("%s %s", book_descrpt[rndm (nbr)], old_name);
1085
1086 book->name = new_name;
1087 }
1088 else 1030 else
1089 {
1090 book->name = old_name; 1031 book->name = old_name;
1091 }
1092 } 1032 }
1093 else if (book->title && strlen (book->msg) > 5) 1033 else if (book->title && strlen (book->msg) > 5)
1094 { /* archive if long msg texts */ 1034 { /* archive if long msg texts */
1095 add_book_to_list (book, msgtype); 1035 add_book_to_list (book, msgtype);
1096 } 1036 }
… …
1286 * for that type exists! 1226 * for that type exists!
1287 */ 1227 */
1288 i = 0; 1228 i = 0;
1289 do 1229 do
1290 { 1230 {
1291 index = rndm (sizeof (art_name_array) / sizeof (arttypename)); 1231 index = rndm (array_length (art_name_array));
1292 type = art_name_array[index].type; 1232 type = art_name_array[index].type;
1293 al = find_artifactlist (type); 1233 al = find_artifactlist (type);
1294 i++; 1234 i++;
1295 } 1235 }
1296 while ((al == NULL) && (i < 10)); 1236 while ((al == NULL) && (i < 10));
… …
1369 1309
1370 /* properties of the artifact */ 1310 /* properties of the artifact */
1371 tmp = object::create (); 1311 tmp = object::create ();
1372 add_abilities (tmp, art->item); 1312 add_abilities (tmp, art->item);
1373 tmp->type = type; 1313 tmp->type = type;
1374 SET_FLAG (tmp, FLAG_IDENTIFIED); 1314 tmp->set_flag (FLAG_IDENTIFIED);
1375 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1) 1315 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
1376 buf << "\rProperties of this artifact include:\r" << ch << "\n"; 1316 buf << "\rProperties of this artifact include:\r" << ch << "\n";
1377 1317
1378 tmp->destroy (); 1318 tmp->destroy ();
1379 1319
… …
1395static char * 1335static char *
1396spellpath_msg (int level) 1336spellpath_msg (int level)
1397{ 1337{
1398 static dynbuf_text buf; buf.clear (); 1338 static dynbuf_text buf; buf.clear ();
1399 1339
1400 static char retbuf[BOOK_BUF];
1401 char tmpbuf[BOOK_BUF];
1402 int path = rndm (NRSPELLPATHS), prayers = rndm (2); 1340 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1403 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1341 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1404 archetype *at; 1342 archetype *at;
1405 1343
1406 /* Preamble */ 1344 /* Preamble */
… …
1616 int i; 1554 int i;
1617 1555
1618 if (enemy && !(god->path_denied & PATH_TURNING)) 1556 if (enemy && !(god->path_denied & PATH_TURNING))
1619 if ((i = nstrtok (enemy, ",")) > 0) 1557 if ((i = nstrtok (enemy, ",")) > 0)
1620 { 1558 {
1621 char tmpbuf[MAX_BUF];
1622
1623 buf << "The holy words of " << name 1559 buf << "The holy words of " << name
1624 << " have the power to slay creatures belonging to the "; 1560 << " have the power to slay creatures belonging to the ";
1625 1561
1626 if (i > 1) 1562 if (i > 1)
1627 buf << "following races:" << strtoktolin (enemy, ","); 1563 buf << "following races:" << strtoktolin (enemy, ",");
… …
1703 { /* spell paths */ 1639 { /* spell paths */
1704 //TODO: 1640 //TODO:
1705 int has_effect = 0, tmpvar; 1641 int has_effect = 0, tmpvar;
1706 char tmpbuf[MAX_BUF]; 1642 char tmpbuf[MAX_BUF];
1707 1643
1708 sprintf (tmpbuf, "\n");
1709 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1644 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
1710 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n"); 1645 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n");
1711 1646
1712 if ((tmpvar = god->path_attuned)) 1647 if ((tmpvar = god->path_attuned))
1713 { 1648 {
… …
1817 } 1752 }
1818} 1753}
1819 1754
1820/***************************************************************************** 1755/*****************************************************************************
1821 * 1756 *
1822 * Cleanup routine for readble stuff.
1823 *
1824 *****************************************************************************/
1825void
1826free_all_readable (void)
1827{
1828 titlelist *tlist, *tnext;
1829 title *title1, *titlenext;
1830 linked_char *lmsg, *nextmsg;
1831 objectlink *monlink, *nextmon;
1832
1833 LOG (llevDebug, "freeing all book information\n");
1834
1835 for (tlist = booklist; tlist; tlist = tnext)
1836 {
1837 tnext = tlist->next;
1838
1839 for (title1 = tlist->first_book; title1; title1 = titlenext)
1840 {
1841 titlenext = title1->next;
1842 delete title1;
1843 }
1844
1845 delete tlist;
1846 }
1847
1848 for (lmsg = first_msg; lmsg; lmsg = nextmsg)
1849 {
1850 nextmsg = lmsg->next;
1851 delete lmsg;
1852 }
1853
1854 for (monlink = first_mon_info; monlink; monlink = nextmon)
1855 {
1856 nextmon = monlink->next;
1857 delete monlink;
1858 }
1859}
1860
1861/*****************************************************************************
1862 *
1863 * Writeback routine for updating the bookarchive. 1757 * Writeback routine for updating the bookarchive.
1864 * 1758 *
1865 ****************************************************************************/ 1759 ****************************************************************************/
1866/* write_book_archive() - write out the updated book archive */ 1760/* write_book_archive() - write out the updated book archive */
1867void 1761void
1868write_book_archive (void) 1762write_book_archive ()
1869{ 1763{
1870 FILE *fp; 1764 FILE *fp;
1871 int index = 0; 1765 int index = 0;
1872 char fname[MAX_BUF]; 1766 char fname[MAX_BUF];
1873 title *book = NULL; 1767 title *book = NULL;

Diff Legend

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