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.15 by pippijn, Wed Jan 3 00:08:17 2007 UTC vs.
Revision 1.22 by root, Sun Mar 18 03:05:39 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
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)
… …
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
… …
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)
… …
918 if (book->type != BOOK) 919 if (book->type != BOOK)
919 return; 920 return;
920 921
921 switch (msgtype) 922 switch (msgtype)
922 { 923 {
923 case 1: /*monster */ 924 case 1: /*monster */
924 nbr = sizeof (mon_book_name) / sizeof (char *); 925 nbr = sizeof (mon_book_name) / sizeof (char *);
925 strcpy (name, mon_book_name[RANDOM () % nbr]); 926 assign (name, mon_book_name[rndm (nbr)]);
926 break; 927 break;
927 case 2: /*artifact */ 928 case 2: /*artifact */
928 nbr = sizeof (art_book_name) / sizeof (char *); 929 nbr = sizeof (art_book_name) / sizeof (char *);
929 strcpy (name, art_book_name[RANDOM () % nbr]); 930 assign (name, art_book_name[rndm (nbr)]);
930 break; 931 break;
931 case 3: /*spellpath */ 932 case 3: /*spellpath */
932 nbr = sizeof (path_book_name) / sizeof (char *); 933 nbr = sizeof (path_book_name) / sizeof (char *);
933 strcpy (name, path_book_name[RANDOM () % nbr]); 934 assign (name, path_book_name[rndm (nbr)]);
934 break; 935 break;
935 case 4: /*alchemy */ 936 case 4: /*alchemy */
936 nbr = sizeof (formula_book_name) / sizeof (char *); 937 nbr = sizeof (formula_book_name) / sizeof (char *);
937 strcpy (name, formula_book_name[RANDOM () % nbr]); 938 assign (name, formula_book_name[rndm (nbr)]);
938 break; 939 break;
939 case 5: /*gods */ 940 case 5: /*gods */
940 nbr = sizeof (gods_book_name) / sizeof (char *); 941 nbr = sizeof (gods_book_name) / sizeof (char *);
941 strcpy (name, gods_book_name[RANDOM () % nbr]); 942 assign (name, gods_book_name[rndm (nbr)]);
942 break; 943 break;
943 case 6: /*msg file */ 944 case 6: /*msg file */
944 default: 945 default:
945 if (book->weight > 2000) 946 if (book->weight > 2000)
946 { /* based on weight */ 947 { /* based on weight */
947 nbr = sizeof (heavy_book_name) / sizeof (char *); 948 nbr = sizeof (heavy_book_name) / sizeof (char *);
948 strcpy (name, heavy_book_name[RANDOM () % nbr]); 949 assign (name, heavy_book_name[rndm (nbr)]);
949 } 950 }
950 else if (book->weight < 2001) 951 else if (book->weight < 2001)
951 { 952 {
952 nbr = sizeof (light_book_name) / sizeof (char *); 953 nbr = sizeof (light_book_name) / sizeof (char *);
953 strcpy (name, light_book_name[RANDOM () % nbr]); 954 assign (name, light_book_name[rndm (nbr)]);
954 } 955 }
955 break; 956 break;
956 } 957 }
957 958
958 book->name = name; 959 book->name = name;
959} 960}
960 961
… …
972 if (msgtype < 0 || strlen (op->msg) < 5) 973 if (msgtype < 0 || strlen (op->msg) < 5)
973 return; 974 return;
974 975
975 switch (msgtype) 976 switch (msgtype)
976 { 977 {
977 case 1: /* monster */ 978 case 1: /* monster */
978 nbr = sizeof (mon_author) / sizeof (char *); 979 nbr = sizeof (mon_author) / sizeof (char *);
979 strcpy (name, mon_author[RANDOM () % nbr]); 980 assign (name, mon_author[rndm (nbr)]);
980 break; 981 break;
981 case 2: /* artifacts */ 982 case 2: /* artifacts */
982 nbr = sizeof (art_author) / sizeof (char *); 983 nbr = sizeof (art_author) / sizeof (char *);
983 strcpy (name, art_author[RANDOM () % nbr]); 984 assign (name, art_author[rndm (nbr)]);
984 break; 985 break;
985 case 3: /* spellpath */ 986 case 3: /* spellpath */
986 nbr = sizeof (path_author) / sizeof (char *); 987 nbr = sizeof (path_author) / sizeof (char *);
987 strcpy (name, path_author[RANDOM () % nbr]); 988 assign (name, path_author[rndm (nbr)]);
988 break; 989 break;
989 case 4: /* alchemy */ 990 case 4: /* alchemy */
990 nbr = sizeof (formula_author) / sizeof (char *); 991 nbr = sizeof (formula_author) / sizeof (char *);
991 strcpy (name, formula_author[RANDOM () % nbr]); 992 assign (name, formula_author[rndm (nbr)]);
992 break; 993 break;
993 case 5: /* gods */ 994 case 5: /* gods */
994 nbr = sizeof (gods_author) / sizeof (char *); 995 nbr = sizeof (gods_author) / sizeof (char *);
995 strcpy (name, gods_author[RANDOM () % nbr]); 996 assign (name, gods_author[rndm (nbr)]);
996 break; 997 break;
997 case 6: /* msg file */ 998 case 6: /* msg file */
998 default: 999 default:
999 strcpy (name, book_author[RANDOM () % nbr]); 1000 assign (name, book_author[rndm (nbr)]);
1000 } 1001 }
1001 1002
1002 sprintf (title, "of %s", name); 1003 sprintf (title, "of %s", name);
1003 op->title = title; 1004 op->title = title;
1004} 1005}
… …
1168 if (RANDOM () % 4) 1169 if (RANDOM () % 4)
1169 { 1170 {
1170 /* Lets give the book a description to individualize it some */ 1171 /* Lets give the book a description to individualize it some */
1171 char new_name[MAX_BUF]; 1172 char new_name[MAX_BUF];
1172 1173
1173 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);
1174 1175
1175 book->name = new_name; 1176 book->name = new_name;
1176 } 1177 }
1177 else 1178 else
1178 { 1179 {
… …
1367 ****************************************************************************/ 1368 ****************************************************************************/
1368 1369
1369/* artifact_msg() - generate a message detailing the properties 1370/* artifact_msg() - generate a message detailing the properties
1370 * of 1-6 artifacts drawn sequentially from the artifact list. 1371 * of 1-6 artifacts drawn sequentially from the artifact list.
1371 */ 1372 */
1372 1373const char *
1373char *
1374artifact_msg (int level, int booksize) 1374artifact_msg (int level, int booksize)
1375{ 1375{
1376 artifactlist *al = NULL; 1376 artifactlist *al = NULL;
1377 artifact *art; 1377 artifact *art;
1378 int chance, i, type, index; 1378 int chance, i, type, index;
1379 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;
1380 char *ch, name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1381 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1381 static char retbuf[BOOK_BUF]; 1382 static char retbuf[BOOK_BUF];
1382 object *tmp = NULL; 1383 object *tmp = NULL;
1383 1384
1384 /* values greater than 5 create msg buffers that are too big! */ 1385 /* values greater than 5 create msg buffers that are too big! */
1385 if (book_entries > 5) 1386 if (book_entries > 5)
… …
1399 i++; 1400 i++;
1400 } 1401 }
1401 while ((al == NULL) && (i < 10)); 1402 while ((al == NULL) && (i < 10));
1402 1403
1403 if (i == 10) /* Unable to find a message */ 1404 if (i == 10) /* Unable to find a message */
1404 return ("None"); 1405 return "None";
1405 1406
1406 /* 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
1407 * take our starting position randomly... */ 1408 * take our starting position randomly... */
1408 art = al->items; 1409 art = al->items;
1409 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1410 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--)
… …
1412 art = al->items; /* hmm, out of stuff, loop back around */ 1413 art = al->items; /* hmm, out of stuff, loop back around */
1413 art = art->next; 1414 art = art->next;
1414 } 1415 }
1415 1416
1416 /* the base 'generic' name for our artifact */ 1417 /* the base 'generic' name for our artifact */
1417 strcpy (name, art_name_array[index].name); 1418 assign (name, art_name_array[index].name);
1418 1419
1419 /* Ok, lets print out the contents */ 1420 /* 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"); 1421 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact");
1421 1422
1422 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1423 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
… …
1526 * or not), and must be within the valid level range. 1527 * or not), and must be within the valid level range.
1527 */ 1528 */
1528 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1529 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))) 1530 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8)))
1530 { 1531 {
1531 strcpy (tmpbuf, at->clone.name); 1532 assign (tmpbuf, at->clone.name);
1532 1533
1533 if (book_overflow (retbuf, tmpbuf, booksize)) 1534 if (book_overflow (retbuf, tmpbuf, booksize))
1534 break; 1535 break;
1535 else 1536 else
1536 { 1537 {
… …
1694 for (i = 0; msg && i < nrofmsg && i != msgnum; i++) 1695 for (i = 0; msg && i < nrofmsg && i != msgnum; i++)
1695 msg = msg->next; 1696 msg = msg->next;
1696 } 1697 }
1697 1698
1698 if (msg && !book_overflow (retbuf, msg->name, booksize)) 1699 if (msg && !book_overflow (retbuf, msg->name, booksize))
1699 strcpy (retbuf, msg->name); 1700 assign (retbuf, msg->name);
1700 else 1701 else
1701 sprintf (retbuf, "\n <undecipherable text>"); 1702 sprintf (retbuf, "\n <undecipherable text>");
1702 1703
1703#ifdef BOOK_MSG_DEBUG 1704#ifdef BOOK_MSG_DEBUG
1704 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));
… …
1706#endif 1707#endif
1707 1708
1708 return retbuf; 1709 return retbuf;
1709} 1710}
1710 1711
1711
1712/* god_info_msg() - generate a message detailing the properties 1712/* god_info_msg() - generate a message detailing the properties
1713 * of a random god. Used by the book hack. b.t. 1713 * of a random god. Used by the book hack. b.t.
1714 */ 1714 */
1715
1716const char * 1715const char *
1717god_info_msg (int level, int booksize) 1716god_info_msg (int level, int booksize)
1718{ 1717{
1719 static char retbuf[BOOK_BUF]; 1718 static char retbuf[BOOK_BUF];
1720 const char *name = NULL; 1719 const char *name = NULL;
… …
1756 const char *enemy = god->title; 1755 const char *enemy = god->title;
1757 1756
1758 if (enemy) 1757 if (enemy)
1759 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);
1760 } 1759 }
1760
1761 if (level == 3 && RANDOM () % 2) 1761 if (level == 3 && RANDOM () % 2)
1762 { /* enemy race, what the god's holy word effects */ 1762 { /* enemy race, what the god's holy word effects */
1763 const char *enemy = god->slaying; 1763 const char *enemy = god->slaying;
1764 1764
1765 if (enemy && !(god->path_denied & PATH_TURNING)) 1765 if (enemy && !(god->path_denied & PATH_TURNING))
… …
1774 else 1774 else
1775 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1775 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1776 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1776 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1777 } 1777 }
1778 } 1778 }
1779
1779 if (level == 4 && RANDOM () % 2) 1780 if (level == 4 && RANDOM () % 2)
1780 { /* Priest of god gets these protect,vulnerable... */ 1781 { /* Priest of god gets these protect,vulnerable... */
1781 char tmpbuf[MAX_BUF], *cp; 1782 char tmpbuf[MAX_BUF];
1782 1783
1783 cp = describe_resistance (god, 1); 1784 if (const char *cp = describe_resistance (god, 1))
1784
1785 if (*cp)
1786 { /* This god does have protections */ 1785 { /* This god does have protections */
1787 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);
1788 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1787 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n");
1789 strcat (tmpbuf, cp); 1788 strcat (tmpbuf, cp);
1790 strcat (buf, tmpbuf); 1789 strcat (buf, tmpbuf);
1791 strcat (buf, "\n ---\n"); 1790 strcat (buf, "\n ---\n");
1792 } 1791 }
1793 else 1792 else
1794 sprintf (buf, " "); 1793 sprintf (buf, " ");
1795 } 1794 }
1795
1796 if (level == 5 && RANDOM () % 2) 1796 if (level == 5 && RANDOM () % 2)
1797 { /* aligned race, summoning */ 1797 { /* aligned race, summoning */
1798 const char *race = god->race; /* aligned race */ 1798 const char *race = god->race; /* aligned race */
1799 1799
1800 if (race && !(god->path_denied & PATH_SUMMON)) 1800 if (race && !(god->path_denied & PATH_SUMMON))
… …
1808 else 1808 else
1809 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1809 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1810 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1810 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1811 } 1811 }
1812 } 1812 }
1813
1813 if (level == 6 && RANDOM () % 2) 1814 if (level == 6 && RANDOM () % 2)
1814 { /* blessing,curse properties of the god */ 1815 { /* blessing,curse properties of the god */
1815 char tmpbuf[MAX_BUF], *cp; 1816 char tmpbuf[MAX_BUF];
1816 1817
1817 cp = describe_resistance (god, 1); 1818 if (const char *cp = describe_resistance (god, 1))
1818
1819 if (*cp)
1820 { /* This god does have protections */ 1819 { /* This god does have protections */
1821 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);
1822 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1821 strcat (tmpbuf, "bestow a blessing which makes the recipient\n");
1823 strcat (tmpbuf, cp); 1822 strcat (tmpbuf, cp);
1824 strcat (buf, tmpbuf); 1823 strcat (buf, tmpbuf);
… …
1826 } 1825 }
1827 else 1826 else
1828 sprintf (buf, " "); 1827 sprintf (buf, " ");
1829 1828
1830 } 1829 }
1830
1831 if (level == 8 && RANDOM () % 2) 1831 if (level == 8 && RANDOM () % 2)
1832 { /* immunity, holy possession */ 1832 { /* immunity, holy possession */
1833 int has_effect = 0, tmpvar; 1833 int has_effect = 0, tmpvar;
1834 char tmpbuf[MAX_BUF]; 1834 char tmpbuf[MAX_BUF];
1835 1835
… …
1844 { 1844 {
1845 has_effect = 1; 1845 has_effect = 1;
1846 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]); 1846 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1847 } 1847 }
1848 } 1848 }
1849
1849 if (has_effect) 1850 if (has_effect)
1850 { 1851 {
1851 strcat (buf, tmpbuf); 1852 strcat (buf, tmpbuf);
1852 strcat (buf, "\n ---\n"); 1853 strcat (buf, "\n ---\n");
1853 } 1854 }
1854 else 1855 else
1855 sprintf (buf, " "); 1856 sprintf (buf, " ");
1856 } 1857 }
1858
1857 if (level == 12 && RANDOM () % 2) 1859 if (level == 12 && RANDOM () % 2)
1858 { /* spell paths */ 1860 { /* spell paths */
1859 int has_effect = 0, tmpvar; 1861 int has_effect = 0, tmpvar;
1860 char tmpbuf[MAX_BUF]; 1862 char tmpbuf[MAX_BUF];
1861 1863
1862 sprintf (tmpbuf, "\n"); 1864 sprintf (tmpbuf, "\n");
1863 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);
1864 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n"); 1866 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n");
1867
1865 if ((tmpvar = god->path_attuned)) 1868 if ((tmpvar = god->path_attuned))
1866 { 1869 {
1867 has_effect = 1; 1870 has_effect = 1;
1868 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned"); 1871 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned");
1869 } 1872 }
1873
1870 if ((tmpvar = god->path_repelled)) 1874 if ((tmpvar = god->path_repelled))
1871 { 1875 {
1872 has_effect = 1; 1876 has_effect = 1;
1873 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled"); 1877 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled");
1874 } 1878 }
1879
1875 if ((tmpvar = god->path_denied)) 1880 if ((tmpvar = god->path_denied))
1876 { 1881 {
1877 has_effect = 1; 1882 has_effect = 1;
1878 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1883 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1879 } 1884 }
1885
1880 if (has_effect) 1886 if (has_effect)
1881 { 1887 {
1882 strcat (buf, tmpbuf); 1888 strcat (buf, tmpbuf);
1883 strcat (buf, "\n ---\n"); 1889 strcat (buf, "\n ---\n");
1884 } 1890 }
… …
1892 */ 1898 */
1893 if (book_overflow (retbuf, buf, booksize)) 1899 if (book_overflow (retbuf, buf, booksize))
1894 break; 1900 break;
1895 else if (strlen (buf) > 1) 1901 else if (strlen (buf) > 1)
1896 strcat (retbuf, buf); 1902 strcat (retbuf, buf);
1903
1897 level--; 1904 level--;
1898 } 1905 }
1906
1899 if (strlen (retbuf) == introlen) 1907 if (strlen (retbuf) == introlen)
1900 { /* we got no information beyond the preamble! */ 1908 { /* we got no information beyond the preamble! */
1901 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1909 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1902 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1910 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1903 } 1911 }

Diff Legend

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