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.9 by root, Thu Sep 14 22:34:00 2006 UTC vs.
Revision 1.23 by root, Thu May 17 21:32:08 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24 25
25/* This file contains code relevant to the BOOKS hack -- designed 26/* This file contains code relevant to the BOOKS hack -- designed
26 * to allow randomly occuring messages in non-magical texts. 27 * to allow randomly occuring messages in non-magical texts.
27 */ 28 */
… …
110 * pointers to all (hostile) monster objects */ 111 * pointers to all (hostile) monster objects */
111 112
112static int nrofmon = 0, need_to_write_bookarchive = 0; 113static int nrofmon = 0, need_to_write_bookarchive = 0;
113 114
114 115
115/* this is needed to keep track of status of initialization 116/* this is needed to keep track of status of initialisation
116 * of the message file */ 117 * of the message file */
117static int nrofmsg = 0; 118static int nrofmsg = 0;
118 119
119/* first_msg is the started of the linked list of messages as read from 120/* first_msg is the started of the linked list of messages as read from
120 * the messages file 121 * the messages file
… …
187 {"Shield", SHIELD}, 188 {"Shield", SHIELD},
188 {"Bracers", BRACERS}, 189 {"Bracers", BRACERS},
189 {"Boots", BOOTS}, 190 {"Boots", BOOTS},
190 {"Cloak", CLOAK}, 191 {"Cloak", CLOAK},
191 {"Gloves", GLOVES}, 192 {"Gloves", GLOVES},
192 {"Gridle", GIRDLE}, 193 {"Girdle", GIRDLE},
193 {"Ring", RING}, 194 {"Ring", RING},
194 {"Horn", HORN}, 195 {"Horn", HORN},
195 {"Missile Weapon", BOW}, 196 {"Missile Weapon", BOW},
196 {"Missile", ARROW}, 197 {"Missile", ARROW},
197 {"Hand Weapon", WEAPON}, 198 {"Hand Weapon", WEAPON},
… …
636 637
637} 638}
638 639
639/***************************************************************************** 640/*****************************************************************************
640 * 641 *
641 * Start of initialization related functions. 642 * Start of initialisation related functions.
642 * 643 *
643 ****************************************************************************/ 644 ****************************************************************************/
644 645
645/* init_msgfile() - if not called before, initialize the info list 646/* init_msgfile() - if not called before, initialise the info list
646 * reads the messages file into the list pointed to by first_msg 647 * reads the messages file into the list pointed to by first_msg
647*/ 648*/
648 649
649static void 650static void
650init_msgfile (void) 651init_msgfile (void)
… …
657 if (did_init_msgfile) 658 if (did_init_msgfile)
658 return; 659 return;
659 did_init_msgfile = 1; 660 did_init_msgfile = 1;
660 661
661 sprintf (fname, "%s/messages", settings.datadir); 662 sprintf (fname, "%s/messages", settings.datadir);
662 LOG (llevDebug, "Reading messages from %s...", fname); 663 LOG (llevDebug, "Reading messages from %s...\n", fname);
663 664
664 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL) 665 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
665 { 666 {
666 linked_char *tmp = NULL; 667 linked_char *tmp = NULL;
667 668
… …
677 if (!strncmp (cp, "ENDMSG", 6)) 678 if (!strncmp (cp, "ENDMSG", 6))
678 { 679 {
679 if (strlen (msgbuf) > BOOK_BUF) 680 if (strlen (msgbuf) > BOOK_BUF)
680 { 681 {
681 LOG (llevDebug, "Warning: this string exceeded max book buf size:"); 682 LOG (llevDebug, "Warning: this string exceeded max book buf size:");
682 LOG (llevDebug, " %s", msgbuf); 683 LOG (llevDebug, " %s\n", msgbuf);
683 } 684 }
684 tmp->name = msgbuf; 685 tmp->name = msgbuf;
685 tmp->next = first_msg; 686 tmp->next = first_msg;
686 first_msg = tmp; 687 first_msg = tmp;
687 nrofmsg++; 688 nrofmsg++;
… …
702 } 703 }
703 close_and_delete (fp, comp); 704 close_and_delete (fp, comp);
704 } 705 }
705 706
706#ifdef BOOK_MSG_DEBUG 707#ifdef BOOK_MSG_DEBUG
707 LOG (llevDebug, "\ninit_info_listfile() got %d messages.\n", nrofmsg); 708 LOG (llevDebug, "init_info_listfile() got %d messages.\n", nrofmsg);
708#endif 709#endif
709 LOG (llevDebug, "done.\n"); 710 LOG (llevDebug, "done.\n");
710} 711}
711 712
712 713
713/* init_book_archive() - if not called before, initialize the info list 714/* init_book_archive() - if not called before, initialise the info list
714 * This reads in the bookarch file into memory. bookarch is the file 715 * This reads in the bookarch file into memory. bookarch is the file
715 * created and updated across multiple runs of the program. 716 * created and updated across multiple runs of the program.
716 */ 717 */
717 718
718static void 719static void
… …
788 book->next = bl->first_book; 789 book->next = bl->first_book;
789 bl->first_book = book; 790 bl->first_book = book;
790 bl->number++; 791 bl->number++;
791 } 792 }
792 } 793 }
793 LOG (llevDebug, " book archives(used/avail): "); 794 LOG (llevDebug, "book archives(used/avail): \n");
794 for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++) 795 for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++)
795 { 796 {
796 LOG (llevDebug, "(%d/%d)", bl->number, max_titles[i]); 797 LOG (llevDebug, " (%d/%d)\n", bl->number, max_titles[i]);
797 } 798 }
798 LOG (llevDebug, "\n");
799 close_and_delete (fp, comp); 799 close_and_delete (fp, comp);
800 } 800 }
801 801
802#ifdef BOOK_MSG_DEBUG 802#ifdef BOOK_MSG_DEBUG
803 LOG (llevDebug, "\n init_book_archive() got %d titles.\n", nroftitle); 803 LOG (llevDebug, "init_book_archive() got %d titles.\n", nroftitle);
804#endif 804#endif
805 LOG (llevDebug, " done.\n"); 805 LOG (llevDebug, " done.\n");
806} 806}
807 807
808/* init_mon_info() - creates the linked list of pointers to 808/* init_mon_info() - creates the linked list of pointers to
… …
815 archetype *at; 815 archetype *at;
816 static int did_init_mon_info = 0; 816 static int did_init_mon_info = 0;
817 817
818 if (did_init_mon_info) 818 if (did_init_mon_info)
819 return; 819 return;
820
820 did_init_mon_info = 1; 821 did_init_mon_info = 1;
821 822
822 823
823 for (at = first_archetype; at != NULL; at = at->next) 824 for (at = first_archetype; at != NULL; at = at->next)
824 { 825 {
825 if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE))) 826 if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE)))
826 { 827 {
827 objectlink *mon = (objectlink *) malloc (sizeof (objectlink)); 828 objectlink *mon = new objectlink;
828 829
829 mon->ob = &at->clone; 830 mon->ob = &at->clone;
830 mon->id = nrofmon;
831 mon->next = first_mon_info; 831 mon->next = first_mon_info;
832 first_mon_info = mon; 832 first_mon_info = mon;
833 nrofmon++; 833 nrofmon++;
834 } 834 }
835 } 835 }
836
836 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 837 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
837} 838}
838 839
839 840
840/* init_readable() - initialize linked lists utilized by 841/* init_readable() - initialise linked lists utilized by
841 * message functions in tailor_readable_ob() 842 * message functions in tailor_readable_ob()
842 * 843 *
843 * This is the function called by the main routine to initialize 844 * This is the function called by the main routine to initialise
844 * all the readable information. 845 * all the readable information.
845 */ 846 */
846 847
847void 848void
848init_readable (void) 849init_readable (void)
849{ 850{
850 static int did_this; 851 static int did_this;
851 852
852 if (did_this) 853 if (did_this)
853 return; 854 return;
855
854 did_this = 1; 856 did_this = 1;
855 857
856 LOG (llevDebug, "Initializing reading data..."); 858 LOG (llevDebug, "Initialising reading data...\n");
857 init_msgfile (); 859 init_msgfile ();
858 init_book_archive (); 860 init_book_archive ();
859 init_mon_info (); 861 init_mon_info ();
860 LOG (llevDebug, " Done\n"); 862 LOG (llevDebug, " Done\n");
861 863
… …
917 if (book->type != BOOK) 919 if (book->type != BOOK)
918 return; 920 return;
919 921
920 switch (msgtype) 922 switch (msgtype)
921 { 923 {
922 case 1: /*monster */ 924 case 1: /*monster */
923 nbr = sizeof (mon_book_name) / sizeof (char *); 925 nbr = sizeof (mon_book_name) / sizeof (char *);
924 strcpy (name, mon_book_name[RANDOM () % nbr]); 926 assign (name, mon_book_name[rndm (nbr)]);
925 break; 927 break;
926 case 2: /*artifact */ 928 case 2: /*artifact */
927 nbr = sizeof (art_book_name) / sizeof (char *); 929 nbr = sizeof (art_book_name) / sizeof (char *);
928 strcpy (name, art_book_name[RANDOM () % nbr]); 930 assign (name, art_book_name[rndm (nbr)]);
929 break; 931 break;
930 case 3: /*spellpath */ 932 case 3: /*spellpath */
931 nbr = sizeof (path_book_name) / sizeof (char *); 933 nbr = sizeof (path_book_name) / sizeof (char *);
932 strcpy (name, path_book_name[RANDOM () % nbr]); 934 assign (name, path_book_name[rndm (nbr)]);
933 break; 935 break;
934 case 4: /*alchemy */ 936 case 4: /*alchemy */
935 nbr = sizeof (formula_book_name) / sizeof (char *); 937 nbr = sizeof (formula_book_name) / sizeof (char *);
936 strcpy (name, formula_book_name[RANDOM () % nbr]); 938 assign (name, formula_book_name[rndm (nbr)]);
937 break; 939 break;
938 case 5: /*gods */ 940 case 5: /*gods */
939 nbr = sizeof (gods_book_name) / sizeof (char *); 941 nbr = sizeof (gods_book_name) / sizeof (char *);
940 strcpy (name, gods_book_name[RANDOM () % nbr]); 942 assign (name, gods_book_name[rndm (nbr)]);
941 break; 943 break;
942 case 6: /*msg file */ 944 case 6: /*msg file */
943 default: 945 default:
944 if (book->weight > 2000) 946 if (book->weight > 2000)
945 { /* based on weight */ 947 { /* based on weight */
946 nbr = sizeof (heavy_book_name) / sizeof (char *); 948 nbr = sizeof (heavy_book_name) / sizeof (char *);
947 strcpy (name, heavy_book_name[RANDOM () % nbr]); 949 assign (name, heavy_book_name[rndm (nbr)]);
948 } 950 }
949 else if (book->weight < 2001) 951 else if (book->weight < 2001)
950 { 952 {
951 nbr = sizeof (light_book_name) / sizeof (char *); 953 nbr = sizeof (light_book_name) / sizeof (char *);
952 strcpy (name, light_book_name[RANDOM () % nbr]); 954 assign (name, light_book_name[rndm (nbr)]);
953 } 955 }
954 break; 956 break;
955 } 957 }
956 958
957 book->name = name; 959 book->name = name;
958} 960}
959 961
… …
971 if (msgtype < 0 || strlen (op->msg) < 5) 973 if (msgtype < 0 || strlen (op->msg) < 5)
972 return; 974 return;
973 975
974 switch (msgtype) 976 switch (msgtype)
975 { 977 {
976 case 1: /* monster */ 978 case 1: /* monster */
977 nbr = sizeof (mon_author) / sizeof (char *); 979 nbr = sizeof (mon_author) / sizeof (char *);
978 strcpy (name, mon_author[RANDOM () % nbr]); 980 assign (name, mon_author[rndm (nbr)]);
979 break; 981 break;
980 case 2: /* artifacts */ 982 case 2: /* artifacts */
981 nbr = sizeof (art_author) / sizeof (char *); 983 nbr = sizeof (art_author) / sizeof (char *);
982 strcpy (name, art_author[RANDOM () % nbr]); 984 assign (name, art_author[rndm (nbr)]);
983 break; 985 break;
984 case 3: /* spellpath */ 986 case 3: /* spellpath */
985 nbr = sizeof (path_author) / sizeof (char *); 987 nbr = sizeof (path_author) / sizeof (char *);
986 strcpy (name, path_author[RANDOM () % nbr]); 988 assign (name, path_author[rndm (nbr)]);
987 break; 989 break;
988 case 4: /* alchemy */ 990 case 4: /* alchemy */
989 nbr = sizeof (formula_author) / sizeof (char *); 991 nbr = sizeof (formula_author) / sizeof (char *);
990 strcpy (name, formula_author[RANDOM () % nbr]); 992 assign (name, formula_author[rndm (nbr)]);
991 break; 993 break;
992 case 5: /* gods */ 994 case 5: /* gods */
993 nbr = sizeof (gods_author) / sizeof (char *); 995 nbr = sizeof (gods_author) / sizeof (char *);
994 strcpy (name, gods_author[RANDOM () % nbr]); 996 assign (name, gods_author[rndm (nbr)]);
995 break; 997 break;
996 case 6: /* msg file */ 998 case 6: /* msg file */
997 default: 999 default:
998 strcpy (name, book_author[RANDOM () % nbr]); 1000 assign (name, book_author[rndm (nbr)]);
999 } 1001 }
1000 1002
1001 sprintf (title, "of %s", name); 1003 sprintf (title, "of %s", name);
1002 op->title = title; 1004 op->title = title;
1003} 1005}
… …
1097 1099
1098 /* alter book properties */ 1100 /* alter book properties */
1099 if ((tmpbook = get_archetype (t->archname)) != NULL) 1101 if ((tmpbook = get_archetype (t->archname)) != NULL)
1100 { 1102 {
1101 tmpbook->msg = book->msg; 1103 tmpbook->msg = book->msg;
1102 copy_object (tmpbook, book); 1104 tmpbook->copy_to (book);
1103 free_object (tmpbook); 1105 tmpbook->destroy ();
1104 } 1106 }
1105 1107
1106 book->title = t->authour; 1108 book->title = t->authour;
1107 book->name = t->name; 1109 book->name = t->name;
1108 book->level = t->level; 1110 book->level = t->level;
… …
1167 if (RANDOM () % 4) 1169 if (RANDOM () % 4)
1168 { 1170 {
1169 /* Lets give the book a description to individualize it some */ 1171 /* Lets give the book a description to individualize it some */
1170 char new_name[MAX_BUF]; 1172 char new_name[MAX_BUF];
1171 1173
1172 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[RANDOM () % nbr], old_name); 1174 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1173 1175
1174 book->name = new_name; 1176 book->name = new_name;
1175 } 1177 }
1176 else 1178 else
1177 { 1179 {
… …
1366 ****************************************************************************/ 1368 ****************************************************************************/
1367 1369
1368/* artifact_msg() - generate a message detailing the properties 1370/* artifact_msg() - generate a message detailing the properties
1369 * of 1-6 artifacts drawn sequentially from the artifact list. 1371 * of 1-6 artifacts drawn sequentially from the artifact list.
1370 */ 1372 */
1371 1373const char *
1372char *
1373artifact_msg (int level, int booksize) 1374artifact_msg (int level, int booksize)
1374{ 1375{
1375 artifactlist *al = NULL; 1376 artifactlist *al = NULL;
1376 artifact *art; 1377 artifact *art;
1377 int chance, i, type, index; 1378 int chance, i, type, index;
1378 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1379 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1;
1380 const char *ch;
1379 char *ch, name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1381 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1380 static char retbuf[BOOK_BUF]; 1382 static char retbuf[BOOK_BUF];
1381 object *tmp = NULL; 1383 object *tmp = NULL;
1382 1384
1383 /* values greater than 5 create msg buffers that are too big! */ 1385 /* values greater than 5 create msg buffers that are too big! */
1384 if (book_entries > 5) 1386 if (book_entries > 5)
… …
1398 i++; 1400 i++;
1399 } 1401 }
1400 while ((al == NULL) && (i < 10)); 1402 while ((al == NULL) && (i < 10));
1401 1403
1402 if (i == 10) /* Unable to find a message */ 1404 if (i == 10) /* Unable to find a message */
1403 return ("None"); 1405 return "None";
1404 1406
1405 /* There is no reason to start on the artifact list at the begining. Lets 1407 /* There is no reason to start on the artifact list at the begining. Lets
1406 * take our starting position randomly... */ 1408 * take our starting position randomly... */
1407 art = al->items; 1409 art = al->items;
1408 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1410 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--)
… …
1411 art = al->items; /* hmm, out of stuff, loop back around */ 1413 art = al->items; /* hmm, out of stuff, loop back around */
1412 art = art->next; 1414 art = art->next;
1413 } 1415 }
1414 1416
1415 /* the base 'generic' name for our artifact */ 1417 /* the base 'generic' name for our artifact */
1416 strcpy (name, art_name_array[index].name); 1418 assign (name, art_name_array[index].name);
1417 1419
1418 /* Ok, lets print out the contents */ 1420 /* Ok, lets print out the contents */
1419 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1421 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact");
1420 1422
1421 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1423 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
… …
1465 * level is kinda high */ 1467 * level is kinda high */
1466 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1468 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF))
1467 strcat (buf, art->item->msg); 1469 strcat (buf, art->item->msg);
1468 1470
1469 /* properties of the artifact */ 1471 /* properties of the artifact */
1470 tmp = get_object (); 1472 tmp = object::create ();
1471 add_abilities (tmp, art->item); 1473 add_abilities (tmp, art->item);
1472 tmp->type = type; 1474 tmp->type = type;
1473 SET_FLAG (tmp, FLAG_IDENTIFIED); 1475 SET_FLAG (tmp, FLAG_IDENTIFIED);
1474 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1476 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1)
1475 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1477 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch);
1476 free_object (tmp); 1478 tmp->destroy ();
1477 /* add the buf if it will fit */ 1479 /* add the buf if it will fit */
1478 if (!book_overflow (retbuf, buf, booksize)) 1480 if (!book_overflow (retbuf, buf, booksize))
1479 strcat (retbuf, buf); 1481 strcat (retbuf, buf);
1480 else 1482 else
1481 break; 1483 break;
… …
1525 * or not), and must be within the valid level range. 1527 * or not), and must be within the valid level range.
1526 */ 1528 */
1527 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1529 if (at->clone.type == SPELL && at->clone.path_attuned & pnum &&
1528 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8))) 1530 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8)))
1529 { 1531 {
1530 strcpy (tmpbuf, at->clone.name); 1532 assign (tmpbuf, at->clone.name);
1531 1533
1532 if (book_overflow (retbuf, tmpbuf, booksize)) 1534 if (book_overflow (retbuf, tmpbuf, booksize))
1533 break; 1535 break;
1534 else 1536 else
1535 { 1537 {
… …
1693 for (i = 0; msg && i < nrofmsg && i != msgnum; i++) 1695 for (i = 0; msg && i < nrofmsg && i != msgnum; i++)
1694 msg = msg->next; 1696 msg = msg->next;
1695 } 1697 }
1696 1698
1697 if (msg && !book_overflow (retbuf, msg->name, booksize)) 1699 if (msg && !book_overflow (retbuf, msg->name, booksize))
1698 strcpy (retbuf, msg->name); 1700 assign (retbuf, msg->name);
1699 else 1701 else
1700 sprintf (retbuf, "\n <undecipherable text>"); 1702 sprintf (retbuf, "\n <undecipherable text>");
1701 1703
1702#ifdef BOOK_MSG_DEBUG 1704#ifdef BOOK_MSG_DEBUG
1703 LOG (llevDebug, "\n info_list_msg() created strng: %d\n", strlen (retbuf)); 1705 LOG (llevDebug, "\n info_list_msg() created strng: %d\n", strlen (retbuf));
… …
1705#endif 1707#endif
1706 1708
1707 return retbuf; 1709 return retbuf;
1708} 1710}
1709 1711
1710
1711/* god_info_msg() - generate a message detailing the properties 1712/* god_info_msg() - generate a message detailing the properties
1712 * of a random god. Used by the book hack. b.t. 1713 * of a random god. Used by the book hack. b.t.
1713 */ 1714 */
1714
1715const char * 1715const char *
1716god_info_msg (int level, int booksize) 1716god_info_msg (int level, int booksize)
1717{ 1717{
1718 static char retbuf[BOOK_BUF]; 1718 static char retbuf[BOOK_BUF];
1719 const char *name = NULL; 1719 const char *name = NULL;
… …
1755 const char *enemy = god->title; 1755 const char *enemy = god->title;
1756 1756
1757 if (enemy) 1757 if (enemy)
1758 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1758 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1759 } 1759 }
1760
1760 if (level == 3 && RANDOM () % 2) 1761 if (level == 3 && RANDOM () % 2)
1761 { /* enemy race, what the god's holy word effects */ 1762 { /* enemy race, what the god's holy word effects */
1762 const char *enemy = god->slaying; 1763 const char *enemy = god->slaying;
1763 1764
1764 if (enemy && !(god->path_denied & PATH_TURNING)) 1765 if (enemy && !(god->path_denied & PATH_TURNING))
… …
1773 else 1774 else
1774 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1775 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1775 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1776 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1776 } 1777 }
1777 } 1778 }
1779
1778 if (level == 4 && RANDOM () % 2) 1780 if (level == 4 && RANDOM () % 2)
1779 { /* Priest of god gets these protect,vulnerable... */ 1781 { /* Priest of god gets these protect,vulnerable... */
1780 char tmpbuf[MAX_BUF], *cp; 1782 char tmpbuf[MAX_BUF];
1781 1783
1782 cp = describe_resistance (god, 1); 1784 if (const char *cp = describe_resistance (god, 1))
1783
1784 if (*cp)
1785 { /* This god does have protections */ 1785 { /* This god does have protections */
1786 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1786 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name);
1787 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1787 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n");
1788 strcat (tmpbuf, cp); 1788 strcat (tmpbuf, cp);
1789 strcat (buf, tmpbuf); 1789 strcat (buf, tmpbuf);
1790 strcat (buf, "\n ---\n"); 1790 strcat (buf, "\n ---\n");
1791 } 1791 }
1792 else 1792 else
1793 sprintf (buf, " "); 1793 sprintf (buf, " ");
1794 } 1794 }
1795
1795 if (level == 5 && RANDOM () % 2) 1796 if (level == 5 && RANDOM () % 2)
1796 { /* aligned race, summoning */ 1797 { /* aligned race, summoning */
1797 const char *race = god->race; /* aligned race */ 1798 const char *race = god->race; /* aligned race */
1798 1799
1799 if (race && !(god->path_denied & PATH_SUMMON)) 1800 if (race && !(god->path_denied & PATH_SUMMON))
… …
1807 else 1808 else
1808 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1809 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1809 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1810 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1810 } 1811 }
1811 } 1812 }
1813
1812 if (level == 6 && RANDOM () % 2) 1814 if (level == 6 && RANDOM () % 2)
1813 { /* blessing,curse properties of the god */ 1815 { /* blessing,curse properties of the god */
1814 char tmpbuf[MAX_BUF], *cp; 1816 char tmpbuf[MAX_BUF];
1815 1817
1816 cp = describe_resistance (god, 1); 1818 if (const char *cp = describe_resistance (god, 1))
1817
1818 if (*cp)
1819 { /* This god does have protections */ 1819 { /* This god does have protections */
1820 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name); 1820 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name);
1821 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1821 strcat (tmpbuf, "bestow a blessing which makes the recipient\n");
1822 strcat (tmpbuf, cp); 1822 strcat (tmpbuf, cp);
1823 strcat (buf, tmpbuf); 1823 strcat (buf, tmpbuf);
… …
1825 } 1825 }
1826 else 1826 else
1827 sprintf (buf, " "); 1827 sprintf (buf, " ");
1828 1828
1829 } 1829 }
1830
1830 if (level == 8 && RANDOM () % 2) 1831 if (level == 8 && RANDOM () % 2)
1831 { /* immunity, holy possession */ 1832 { /* immunity, holy possession */
1832 int has_effect = 0, tmpvar; 1833 int has_effect = 0, tmpvar;
1833 char tmpbuf[MAX_BUF]; 1834 char tmpbuf[MAX_BUF];
1834 1835
… …
1843 { 1844 {
1844 has_effect = 1; 1845 has_effect = 1;
1845 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]); 1846 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1846 } 1847 }
1847 } 1848 }
1849
1848 if (has_effect) 1850 if (has_effect)
1849 { 1851 {
1850 strcat (buf, tmpbuf); 1852 strcat (buf, tmpbuf);
1851 strcat (buf, "\n ---\n"); 1853 strcat (buf, "\n ---\n");
1852 } 1854 }
1853 else 1855 else
1854 sprintf (buf, " "); 1856 sprintf (buf, " ");
1855 } 1857 }
1858
1856 if (level == 12 && RANDOM () % 2) 1859 if (level == 12 && RANDOM () % 2)
1857 { /* spell paths */ 1860 { /* spell paths */
1858 int has_effect = 0, tmpvar; 1861 int has_effect = 0, tmpvar;
1859 char tmpbuf[MAX_BUF]; 1862 char tmpbuf[MAX_BUF];
1860 1863
1861 sprintf (tmpbuf, "\n"); 1864 sprintf (tmpbuf, "\n");
1862 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1865 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
1863 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n"); 1866 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n");
1867
1864 if ((tmpvar = god->path_attuned)) 1868 if ((tmpvar = god->path_attuned))
1865 { 1869 {
1866 has_effect = 1; 1870 has_effect = 1;
1867 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned"); 1871 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned");
1868 } 1872 }
1873
1869 if ((tmpvar = god->path_repelled)) 1874 if ((tmpvar = god->path_repelled))
1870 { 1875 {
1871 has_effect = 1; 1876 has_effect = 1;
1872 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled"); 1877 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled");
1873 } 1878 }
1879
1874 if ((tmpvar = god->path_denied)) 1880 if ((tmpvar = god->path_denied))
1875 { 1881 {
1876 has_effect = 1; 1882 has_effect = 1;
1877 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1883 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1878 } 1884 }
1885
1879 if (has_effect) 1886 if (has_effect)
1880 { 1887 {
1881 strcat (buf, tmpbuf); 1888 strcat (buf, tmpbuf);
1882 strcat (buf, "\n ---\n"); 1889 strcat (buf, "\n ---\n");
1883 } 1890 }
… …
1891 */ 1898 */
1892 if (book_overflow (retbuf, buf, booksize)) 1899 if (book_overflow (retbuf, buf, booksize))
1893 break; 1900 break;
1894 else if (strlen (buf) > 1) 1901 else if (strlen (buf) > 1)
1895 strcat (retbuf, buf); 1902 strcat (retbuf, buf);
1903
1896 level--; 1904 level--;
1897 } 1905 }
1906
1898 if (strlen (retbuf) == introlen) 1907 if (strlen (retbuf) == introlen)
1899 { /* we got no information beyond the preamble! */ 1908 { /* we got no information beyond the preamble! */
1900 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1909 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1901 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1910 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1902 } 1911 }
… …
1978 strcpy (msgbuf, msgfile_msg (level, book_buf_size)); 1987 strcpy (msgbuf, msgfile_msg (level, book_buf_size));
1979 break; 1988 break;
1980 } 1989 }
1981 1990
1982 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */ 1991 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1992
1983 if (strlen (msgbuf) > 1) 1993 if (strlen (msgbuf) > 1)
1984 { 1994 {
1985 book->msg = msgbuf; 1995 book->msg = msgbuf;
1986 /* lets give the "book" a new name, which may be a compound word */ 1996 /* lets give the "book" a new name, which may be a compound word */
1987 change_book (book, msg_type); 1997 change_book (book, msg_type);
… …
2016 delete title1; 2026 delete title1;
2017 } 2027 }
2018 2028
2019 delete tlist; 2029 delete tlist;
2020 } 2030 }
2031
2021 for (lmsg = first_msg; lmsg; lmsg = nextmsg) 2032 for (lmsg = first_msg; lmsg; lmsg = nextmsg)
2022 { 2033 {
2023 nextmsg = lmsg->next; 2034 nextmsg = lmsg->next;
2024 delete lmsg; 2035 delete lmsg;
2025 } 2036 }
2037
2026 for (monlink = first_mon_info; monlink; monlink = nextmon) 2038 for (monlink = first_mon_info; monlink; monlink = nextmon)
2027 { 2039 {
2028 nextmon = monlink->next; 2040 nextmon = monlink->next;
2029 free (monlink); 2041 delete monlink;
2030 } 2042 }
2031} 2043}
2032 2044
2033 2045
2034/***************************************************************************** 2046/*****************************************************************************

Diff Legend

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