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.16 by pippijn, Wed Jan 3 00:21:35 2007 UTC vs.
Revision 1.24 by root, Thu May 24 03:33:28 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 */
… …
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},
… …
640 * 641 *
641 * Start of initialisation related functions. 642 * Start of initialisation related functions.
642 * 643 *
643 ****************************************************************************/ 644 ****************************************************************************/
644 645
645/* init_msgfile() - if not called before, initialise the info list
646 * reads the messages file into the list pointed to by first_msg
647*/
648
649static void
650init_msgfile (void)
651{
652 FILE *fp;
653 char buf[MAX_BUF], msgbuf[HUGE_BUF], fname[MAX_BUF], *cp;
654 int comp;
655 static int did_init_msgfile;
656
657 if (did_init_msgfile)
658 return;
659 did_init_msgfile = 1;
660
661 sprintf (fname, "%s/messages", settings.datadir);
662 LOG (llevDebug, "Reading messages from %s...\n", fname);
663
664 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
665 {
666 linked_char *tmp = NULL;
667
668 while (fgets (buf, MAX_BUF, fp) != NULL)
669 {
670 if (*buf == '#')
671 continue;
672 if ((cp = strchr (buf, '\n')) != NULL)
673 *cp = '\0';
674 cp = buf;
675 while (*cp == ' ') /* Skip blanks */
676 cp++;
677 if (!strncmp (cp, "ENDMSG", 6))
678 {
679 if (strlen (msgbuf) > BOOK_BUF)
680 {
681 LOG (llevDebug, "Warning: this string exceeded max book buf size:");
682 LOG (llevDebug, " %s\n", msgbuf);
683 }
684 tmp->name = msgbuf;
685 tmp->next = first_msg;
686 first_msg = tmp;
687 nrofmsg++;
688 continue;
689 }
690 else if (!strncmp (cp, "MSG", 3))
691 {
692 tmp = new linked_char;
693
694 strcpy (msgbuf, " "); /* reset msgbuf for new message */
695 continue;
696 }
697 else if (!buf_overflow (msgbuf, cp, HUGE_BUF - 1))
698 {
699 strcat (msgbuf, cp);
700 strcat (msgbuf, "\n");
701 }
702 }
703 close_and_delete (fp, comp);
704 }
705
706#ifdef BOOK_MSG_DEBUG
707 LOG (llevDebug, "init_info_listfile() got %d messages.\n", nrofmsg);
708#endif
709 LOG (llevDebug, "done.\n");
710}
711
712
713/* init_book_archive() - if not called before, initialise the info list 646/* init_book_archive() - if not called before, initialise the info list
714 * This reads in the bookarch file into memory. bookarch is the file 647 * This reads in the bookarch file into memory. bookarch is the file
715 * created and updated across multiple runs of the program. 648 * created and updated across multiple runs of the program.
716 */ 649 */
717
718static void 650static void
719init_book_archive (void) 651init_book_archive (void)
720{ 652{
721 FILE *fp; 653 FILE *fp;
722 int comp, nroftitle = 0; 654 int comp, nroftitle = 0;
… …
834 } 766 }
835 767
836 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 768 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
837} 769}
838 770
839
840/* init_readable() - initialise linked lists utilized by 771/* init_readable() - initialise linked lists utilized by
841 * message functions in tailor_readable_ob() 772 * message functions in tailor_readable_ob()
842 * 773 *
843 * This is the function called by the main routine to initialise 774 * This is the function called by the main routine to initialise
844 * all the readable information. 775 * all the readable information.
845 */ 776 */
846
847void 777void
848init_readable (void) 778init_readable (void)
849{ 779{
850 static int did_this; 780 static int did_this;
851 781
… …
853 return; 783 return;
854 784
855 did_this = 1; 785 did_this = 1;
856 786
857 LOG (llevDebug, "Initialising reading data...\n"); 787 LOG (llevDebug, "Initialising reading data...\n");
858 init_msgfile ();
859 init_book_archive (); 788 init_book_archive ();
860 init_mon_info (); 789 init_mon_info ();
861 LOG (llevDebug, " Done\n"); 790 LOG (llevDebug, " Done\n");
862
863} 791}
864 792
865/***************************************************************************** 793/*****************************************************************************
866 * 794 *
867 * This is the start of the administrative functions when creating 795 * This is the start of the administrative functions when creating
868 * new books (ie, updating title and the like) 796 * new books (ie, updating title and the like)
869 * 797 *
870 *****************************************************************************/ 798 *****************************************************************************/
871 799
872
873/* find_title() - Search the titlelist (based on msgtype) to see if 800/* find_title() - Search the titlelist (based on msgtype) to see if
874 * book matches something already there. IF so, return that title. 801 * book matches something already there. IF so, return that title.
875 */ 802 */
876
877static title * 803static title *
878find_title (const object *book, int msgtype) 804find_title (const object *book, int msgtype)
879{ 805{
880 title *t = NULL; 806 title *t = NULL;
881 titlelist *tl = get_titlelist (msgtype); 807 titlelist *tl = get_titlelist (msgtype);
… …
918 if (book->type != BOOK) 844 if (book->type != BOOK)
919 return; 845 return;
920 846
921 switch (msgtype) 847 switch (msgtype)
922 { 848 {
923 case 1: /*monster */ 849 case 1: /*monster */
924 nbr = sizeof (mon_book_name) / sizeof (char *); 850 nbr = sizeof (mon_book_name) / sizeof (char *);
925 strcpy (name, mon_book_name[RANDOM () % nbr]); 851 assign (name, mon_book_name[rndm (nbr)]);
926 break; 852 break;
927 case 2: /*artifact */ 853 case 2: /*artifact */
928 nbr = sizeof (art_book_name) / sizeof (char *); 854 nbr = sizeof (art_book_name) / sizeof (char *);
929 strcpy (name, art_book_name[RANDOM () % nbr]); 855 assign (name, art_book_name[rndm (nbr)]);
930 break; 856 break;
931 case 3: /*spellpath */ 857 case 3: /*spellpath */
932 nbr = sizeof (path_book_name) / sizeof (char *); 858 nbr = sizeof (path_book_name) / sizeof (char *);
933 strcpy (name, path_book_name[RANDOM () % nbr]); 859 assign (name, path_book_name[rndm (nbr)]);
934 break; 860 break;
935 case 4: /*alchemy */ 861 case 4: /*alchemy */
936 nbr = sizeof (formula_book_name) / sizeof (char *); 862 nbr = sizeof (formula_book_name) / sizeof (char *);
937 strcpy (name, formula_book_name[RANDOM () % nbr]); 863 assign (name, formula_book_name[rndm (nbr)]);
938 break; 864 break;
939 case 5: /*gods */ 865 case 5: /*gods */
940 nbr = sizeof (gods_book_name) / sizeof (char *); 866 nbr = sizeof (gods_book_name) / sizeof (char *);
941 strcpy (name, gods_book_name[RANDOM () % nbr]); 867 assign (name, gods_book_name[rndm (nbr)]);
942 break; 868 break;
943 case 6: /*msg file */ 869 case 6: /*msg file */
944 default: 870 default:
945 if (book->weight > 2000) 871 if (book->weight > 2000)
946 { /* based on weight */ 872 { /* based on weight */
947 nbr = sizeof (heavy_book_name) / sizeof (char *); 873 nbr = sizeof (heavy_book_name) / sizeof (char *);
948 strcpy (name, heavy_book_name[RANDOM () % nbr]); 874 assign (name, heavy_book_name[rndm (nbr)]);
949 } 875 }
950 else if (book->weight < 2001) 876 else if (book->weight < 2001)
951 { 877 {
952 nbr = sizeof (light_book_name) / sizeof (char *); 878 nbr = sizeof (light_book_name) / sizeof (char *);
953 strcpy (name, light_book_name[RANDOM () % nbr]); 879 assign (name, light_book_name[rndm (nbr)]);
954 } 880 }
955 break; 881 break;
956 } 882 }
957 883
958 book->name = name; 884 book->name = name;
959} 885}
960 886
… …
972 if (msgtype < 0 || strlen (op->msg) < 5) 898 if (msgtype < 0 || strlen (op->msg) < 5)
973 return; 899 return;
974 900
975 switch (msgtype) 901 switch (msgtype)
976 { 902 {
977 case 1: /* monster */ 903 case 1: /* monster */
978 nbr = sizeof (mon_author) / sizeof (char *); 904 nbr = sizeof (mon_author) / sizeof (char *);
979 strcpy (name, mon_author[RANDOM () % nbr]); 905 assign (name, mon_author[rndm (nbr)]);
980 break; 906 break;
981 case 2: /* artifacts */ 907 case 2: /* artifacts */
982 nbr = sizeof (art_author) / sizeof (char *); 908 nbr = sizeof (art_author) / sizeof (char *);
983 strcpy (name, art_author[RANDOM () % nbr]); 909 assign (name, art_author[rndm (nbr)]);
984 break; 910 break;
985 case 3: /* spellpath */ 911 case 3: /* spellpath */
986 nbr = sizeof (path_author) / sizeof (char *); 912 nbr = sizeof (path_author) / sizeof (char *);
987 strcpy (name, path_author[RANDOM () % nbr]); 913 assign (name, path_author[rndm (nbr)]);
988 break; 914 break;
989 case 4: /* alchemy */ 915 case 4: /* alchemy */
990 nbr = sizeof (formula_author) / sizeof (char *); 916 nbr = sizeof (formula_author) / sizeof (char *);
991 strcpy (name, formula_author[RANDOM () % nbr]); 917 assign (name, formula_author[rndm (nbr)]);
992 break; 918 break;
993 case 5: /* gods */ 919 case 5: /* gods */
994 nbr = sizeof (gods_author) / sizeof (char *); 920 nbr = sizeof (gods_author) / sizeof (char *);
995 strcpy (name, gods_author[RANDOM () % nbr]); 921 assign (name, gods_author[rndm (nbr)]);
996 break; 922 break;
997 case 6: /* msg file */ 923 case 6: /* msg file */
998 default: 924 default:
999 strcpy (name, book_author[RANDOM () % nbr]); 925 assign (name, book_author[rndm (nbr)]);
1000 } 926 }
1001 927
1002 sprintf (title, "of %s", name); 928 sprintf (title, "of %s", name);
1003 op->title = title; 929 op->title = title;
1004} 930}
… …
1168 if (RANDOM () % 4) 1094 if (RANDOM () % 4)
1169 { 1095 {
1170 /* Lets give the book a description to individualize it some */ 1096 /* Lets give the book a description to individualize it some */
1171 char new_name[MAX_BUF]; 1097 char new_name[MAX_BUF];
1172 1098
1173 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[RANDOM () % nbr], old_name); 1099 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1174 1100
1175 book->name = new_name; 1101 book->name = new_name;
1176 } 1102 }
1177 else 1103 else
1178 { 1104 {
… …
1367 ****************************************************************************/ 1293 ****************************************************************************/
1368 1294
1369/* artifact_msg() - generate a message detailing the properties 1295/* artifact_msg() - generate a message detailing the properties
1370 * of 1-6 artifacts drawn sequentially from the artifact list. 1296 * of 1-6 artifacts drawn sequentially from the artifact list.
1371 */ 1297 */
1372 1298const char *
1373char *
1374artifact_msg (int level, int booksize) 1299artifact_msg (int level, int booksize)
1375{ 1300{
1376 artifactlist *al = NULL; 1301 artifactlist *al = NULL;
1377 artifact *art; 1302 artifact *art;
1378 int chance, i, type, index; 1303 int chance, i, type, index;
1379 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1304 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1;
1305 const char *ch;
1380 char *ch, name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1306 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1381 static char retbuf[BOOK_BUF]; 1307 static char retbuf[BOOK_BUF];
1382 object *tmp = NULL; 1308 object *tmp = NULL;
1383 1309
1384 /* values greater than 5 create msg buffers that are too big! */ 1310 /* values greater than 5 create msg buffers that are too big! */
1385 if (book_entries > 5) 1311 if (book_entries > 5)
… …
1399 i++; 1325 i++;
1400 } 1326 }
1401 while ((al == NULL) && (i < 10)); 1327 while ((al == NULL) && (i < 10));
1402 1328
1403 if (i == 10) /* Unable to find a message */ 1329 if (i == 10) /* Unable to find a message */
1404 return ("None"); 1330 return "None";
1405 1331
1406 /* There is no reason to start on the artifact list at the begining. Lets 1332 /* There is no reason to start on the artifact list at the begining. Lets
1407 * take our starting position randomly... */ 1333 * take our starting position randomly... */
1408 art = al->items; 1334 art = al->items;
1409 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1335 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--)
… …
1412 art = al->items; /* hmm, out of stuff, loop back around */ 1338 art = al->items; /* hmm, out of stuff, loop back around */
1413 art = art->next; 1339 art = art->next;
1414 } 1340 }
1415 1341
1416 /* the base 'generic' name for our artifact */ 1342 /* the base 'generic' name for our artifact */
1417 strcpy (name, art_name_array[index].name); 1343 assign (name, art_name_array[index].name);
1418 1344
1419 /* Ok, lets print out the contents */ 1345 /* Ok, lets print out the contents */
1420 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1346 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact");
1421 1347
1422 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1348 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
… …
1526 * or not), and must be within the valid level range. 1452 * or not), and must be within the valid level range.
1527 */ 1453 */
1528 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1454 if (at->clone.type == SPELL && at->clone.path_attuned & pnum &&
1529 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8))) 1455 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8)))
1530 { 1456 {
1531 strcpy (tmpbuf, at->clone.name); 1457 assign (tmpbuf, at->clone.name);
1532 1458
1533 if (book_overflow (retbuf, tmpbuf, booksize)) 1459 if (book_overflow (retbuf, tmpbuf, booksize))
1534 break; 1460 break;
1535 else 1461 else
1536 { 1462 {
… …
1554 strcat (retbuf, "\n"); 1480 strcat (retbuf, "\n");
1555 } 1481 }
1556 return retbuf; 1482 return retbuf;
1557} 1483}
1558 1484
1559
1560
1561/* formula_msg() - generate a message detailing the properties 1485/* formula_msg() - generate a message detailing the properties
1562 * of a randomly selected alchemical formula. 1486 * of a randomly selected alchemical formula.
1563 */ 1487 */
1564
1565void 1488void
1566make_formula_book (object *book, int level) 1489make_formula_book (object *book, int level)
1567{ 1490{
1568 char retbuf[BOOK_BUF], title[MAX_BUF]; 1491 char retbuf[BOOK_BUF], title[MAX_BUF];
1569 recipelist *fl; 1492 recipelist *fl;
… …
1671 1594
1672 book->msg = retbuf; 1595 book->msg = retbuf;
1673 } 1596 }
1674} 1597}
1675 1598
1676
1677/* msgfile_msg() - generate a message drawn randomly from a
1678 * file in lib/. Level currently has no effect on the message
1679 * which is returned.
1680 */
1681
1682char *
1683msgfile_msg (int level, int booksize)
1684{
1685 static char retbuf[BOOK_BUF];
1686 int i, msgnum;
1687 linked_char *msg = NULL;
1688
1689 /* get a random message for the 'book' from linked list */
1690 if (nrofmsg > 1)
1691 {
1692 msg = first_msg;
1693 msgnum = RANDOM () % nrofmsg;
1694 for (i = 0; msg && i < nrofmsg && i != msgnum; i++)
1695 msg = msg->next;
1696 }
1697
1698 if (msg && !book_overflow (retbuf, msg->name, booksize))
1699 strcpy (retbuf, msg->name);
1700 else
1701 sprintf (retbuf, "\n <undecipherable text>");
1702
1703#ifdef BOOK_MSG_DEBUG
1704 LOG (llevDebug, "\n info_list_msg() created strng: %d\n", strlen (retbuf));
1705 LOG (llevDebug, " MADE THIS:\n%s\n", retbuf);
1706#endif
1707
1708 return retbuf;
1709}
1710
1711
1712/* god_info_msg() - generate a message detailing the properties 1599/* god_info_msg() - generate a message detailing the properties
1713 * of a random god. Used by the book hack. b.t. 1600 * of a random god. Used by the book hack. b.t.
1714 */ 1601 */
1715
1716const char * 1602const char *
1717god_info_msg (int level, int booksize) 1603god_info_msg (int level, int booksize)
1718{ 1604{
1719 static char retbuf[BOOK_BUF]; 1605 static char retbuf[BOOK_BUF];
1720 const char *name = NULL; 1606 const char *name = NULL;
… …
1756 const char *enemy = god->title; 1642 const char *enemy = god->title;
1757 1643
1758 if (enemy) 1644 if (enemy)
1759 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1645 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1760 } 1646 }
1647
1761 if (level == 3 && RANDOM () % 2) 1648 if (level == 3 && RANDOM () % 2)
1762 { /* enemy race, what the god's holy word effects */ 1649 { /* enemy race, what the god's holy word effects */
1763 const char *enemy = god->slaying; 1650 const char *enemy = god->slaying;
1764 1651
1765 if (enemy && !(god->path_denied & PATH_TURNING)) 1652 if (enemy && !(god->path_denied & PATH_TURNING))
… …
1774 else 1661 else
1775 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1662 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1776 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1663 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1777 } 1664 }
1778 } 1665 }
1666
1779 if (level == 4 && RANDOM () % 2) 1667 if (level == 4 && RANDOM () % 2)
1780 { /* Priest of god gets these protect,vulnerable... */ 1668 { /* Priest of god gets these protect,vulnerable... */
1781 char tmpbuf[MAX_BUF], *cp; 1669 char tmpbuf[MAX_BUF];
1782 1670
1783 cp = describe_resistance (god, 1); 1671 if (const char *cp = describe_resistance (god, 1))
1784
1785 if (*cp)
1786 { /* This god does have protections */ 1672 { /* This god does have protections */
1787 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1673 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name);
1788 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1674 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n");
1789 strcat (tmpbuf, cp); 1675 strcat (tmpbuf, cp);
1790 strcat (buf, tmpbuf); 1676 strcat (buf, tmpbuf);
1791 strcat (buf, "\n ---\n"); 1677 strcat (buf, "\n ---\n");
1792 } 1678 }
1793 else 1679 else
1794 sprintf (buf, " "); 1680 sprintf (buf, " ");
1795 } 1681 }
1682
1796 if (level == 5 && RANDOM () % 2) 1683 if (level == 5 && RANDOM () % 2)
1797 { /* aligned race, summoning */ 1684 { /* aligned race, summoning */
1798 const char *race = god->race; /* aligned race */ 1685 const char *race = god->race; /* aligned race */
1799 1686
1800 if (race && !(god->path_denied & PATH_SUMMON)) 1687 if (race && !(god->path_denied & PATH_SUMMON))
… …
1808 else 1695 else
1809 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1696 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1810 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1697 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1811 } 1698 }
1812 } 1699 }
1700
1813 if (level == 6 && RANDOM () % 2) 1701 if (level == 6 && RANDOM () % 2)
1814 { /* blessing,curse properties of the god */ 1702 { /* blessing,curse properties of the god */
1815 char tmpbuf[MAX_BUF], *cp; 1703 char tmpbuf[MAX_BUF];
1816 1704
1817 cp = describe_resistance (god, 1); 1705 if (const char *cp = describe_resistance (god, 1))
1818
1819 if (*cp)
1820 { /* This god does have protections */ 1706 { /* This god does have protections */
1821 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name); 1707 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name);
1822 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1708 strcat (tmpbuf, "bestow a blessing which makes the recipient\n");
1823 strcat (tmpbuf, cp); 1709 strcat (tmpbuf, cp);
1824 strcat (buf, tmpbuf); 1710 strcat (buf, tmpbuf);
… …
1826 } 1712 }
1827 else 1713 else
1828 sprintf (buf, " "); 1714 sprintf (buf, " ");
1829 1715
1830 } 1716 }
1717
1831 if (level == 8 && RANDOM () % 2) 1718 if (level == 8 && RANDOM () % 2)
1832 { /* immunity, holy possession */ 1719 { /* immunity, holy possession */
1833 int has_effect = 0, tmpvar; 1720 int has_effect = 0, tmpvar;
1834 char tmpbuf[MAX_BUF]; 1721 char tmpbuf[MAX_BUF];
1835 1722
… …
1844 { 1731 {
1845 has_effect = 1; 1732 has_effect = 1;
1846 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]); 1733 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1847 } 1734 }
1848 } 1735 }
1736
1849 if (has_effect) 1737 if (has_effect)
1850 { 1738 {
1851 strcat (buf, tmpbuf); 1739 strcat (buf, tmpbuf);
1852 strcat (buf, "\n ---\n"); 1740 strcat (buf, "\n ---\n");
1853 } 1741 }
1854 else 1742 else
1855 sprintf (buf, " "); 1743 sprintf (buf, " ");
1856 } 1744 }
1745
1857 if (level == 12 && RANDOM () % 2) 1746 if (level == 12 && RANDOM () % 2)
1858 { /* spell paths */ 1747 { /* spell paths */
1859 int has_effect = 0, tmpvar; 1748 int has_effect = 0, tmpvar;
1860 char tmpbuf[MAX_BUF]; 1749 char tmpbuf[MAX_BUF];
1861 1750
1862 sprintf (tmpbuf, "\n"); 1751 sprintf (tmpbuf, "\n");
1863 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1752 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
1864 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n"); 1753 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n");
1754
1865 if ((tmpvar = god->path_attuned)) 1755 if ((tmpvar = god->path_attuned))
1866 { 1756 {
1867 has_effect = 1; 1757 has_effect = 1;
1868 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned"); 1758 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned");
1869 } 1759 }
1760
1870 if ((tmpvar = god->path_repelled)) 1761 if ((tmpvar = god->path_repelled))
1871 { 1762 {
1872 has_effect = 1; 1763 has_effect = 1;
1873 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled"); 1764 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled");
1874 } 1765 }
1766
1875 if ((tmpvar = god->path_denied)) 1767 if ((tmpvar = god->path_denied))
1876 { 1768 {
1877 has_effect = 1; 1769 has_effect = 1;
1878 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1770 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1879 } 1771 }
1772
1880 if (has_effect) 1773 if (has_effect)
1881 { 1774 {
1882 strcat (buf, tmpbuf); 1775 strcat (buf, tmpbuf);
1883 strcat (buf, "\n ---\n"); 1776 strcat (buf, "\n ---\n");
1884 } 1777 }
… …
1892 */ 1785 */
1893 if (book_overflow (retbuf, buf, booksize)) 1786 if (book_overflow (retbuf, buf, booksize))
1894 break; 1787 break;
1895 else if (strlen (buf) > 1) 1788 else if (strlen (buf) > 1)
1896 strcat (retbuf, buf); 1789 strcat (retbuf, buf);
1790
1897 level--; 1791 level--;
1898 } 1792 }
1793
1899 if (strlen (retbuf) == introlen) 1794 if (strlen (retbuf) == introlen)
1900 { /* we got no information beyond the preamble! */ 1795 { /* we got no information beyond the preamble! */
1901 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1796 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1902 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1797 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1903 } 1798 }
… …
1922 * book is the object we are creating into. 1817 * book is the object we are creating into.
1923 * If msg_type is a positive value, we use that to determine the 1818 * If msg_type is a positive value, we use that to determine the
1924 * message type - otherwise a random value is used. 1819 * message type - otherwise a random value is used.
1925 * 1820 *
1926 */ 1821 */
1927
1928void 1822void
1929tailor_readable_ob (object *book, int msg_type) 1823tailor_readable_ob (object *book, int msg_type)
1930{ 1824{
1931 char msgbuf[BOOK_BUF]; 1825 char msgbuf[BOOK_BUF];
1932 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1826 int level = book->level ? (RANDOM () % book->level) + 1 : 1;
… …
1955 */ 1849 */
1956 1850
1957 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1851 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6);
1958 switch (msg_type) 1852 switch (msg_type)
1959 { 1853 {
1960 case 1: /* monster attrib */ 1854 case 1: /* monster attrib */
1961 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1855 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1962 break; 1856 break;
1963 case 2: /* artifact attrib */ 1857 case 2: /* artifact attrib */
1964 strcpy (msgbuf, artifact_msg (level, book_buf_size)); 1858 strcpy (msgbuf, artifact_msg (level, book_buf_size));
1965 break; 1859 break;
1966 case 3: /* grouping incantations/prayers by path */ 1860 case 3: /* grouping incantations/prayers by path */
1967 strcpy (msgbuf, spellpath_msg (level, book_buf_size)); 1861 strcpy (msgbuf, spellpath_msg (level, book_buf_size));
1968 break; 1862 break;
1969 case 4: /* describe an alchemy formula */ 1863 case 4: /* describe an alchemy formula */
1970 make_formula_book (book, level); 1864 make_formula_book (book, level);
1971 /* make_formula_book already gives title */ 1865 /* make_formula_book already gives title */
1972 return; 1866 return;
1973 break; 1867 break;
1974 case 5: /* bits of information about a god */ 1868 case 5: /* bits of information about a god */
1975 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1869 strcpy (msgbuf, god_info_msg (level, book_buf_size));
1976 break; 1870 break;
1977 case 0: /* use info list in lib/ */ 1871 case 0: /* use info list in lib/ */
1978 default: 1872 default:
1979 strcpy (msgbuf, msgfile_msg (level, book_buf_size)); 1873 cfperl_make_book (book, level);
1980 break; 1874 return;
1981 } 1875 }
1982 1876
1983 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */ 1877 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1984 1878
1985 if (strlen (msgbuf) > 1) 1879 if (strlen (msgbuf) > 1)

Diff Legend

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