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.7 by root, Wed Sep 13 23:39:27 2006 UTC vs.
Revision 1.10 by root, Fri Sep 29 21:55:54 2006 UTC

16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 20
21 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22*/
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.
1611 archetype *at; 1611 archetype *at;
1612 1612
1613 /* preamble */ 1613 /* preamble */
1614 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1614 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1615 1615
1616 if ((at = find_archetype (op_name)) != (archetype *) NULL) 1616 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1617 op_name = at->clone.name; 1617 op_name = at->clone.name;
1618 else 1618 else
1619 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1619 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1620 1620
1621 /* item name */ 1621 /* item name */
1650 if (formula->ingred != NULL) 1650 if (formula->ingred != NULL)
1651 { 1651 {
1652 linked_char *next; 1652 linked_char *next;
1653 archetype *at; 1653 archetype *at;
1654 1654
1655 at = find_archetype (formula->cauldron); 1655 at = archetype::find (formula->cauldron);
1656 1656
1657 sprintf (retbuf + strlen (retbuf), 1657 sprintf (retbuf + strlen (retbuf),
1658 " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place"); 1658 " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place");
1659 1659
1660 for (next = formula->ingred; next != NULL; next = next->next) 1660 for (next = formula->ingred; next != NULL; next = next->next)
1978 strcpy (msgbuf, msgfile_msg (level, book_buf_size)); 1978 strcpy (msgbuf, msgfile_msg (level, book_buf_size));
1979 break; 1979 break;
1980 } 1980 }
1981 1981
1982 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */ 1982 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1983
1983 if (strlen (msgbuf) > 1) 1984 if (strlen (msgbuf) > 1)
1984 { 1985 {
1985 book->msg = msgbuf; 1986 book->msg = msgbuf;
1986 /* lets give the "book" a new name, which may be a compound word */ 1987 /* lets give the "book" a new name, which may be a compound word */
1987 change_book (book, msg_type); 1988 change_book (book, msg_type);
2016 delete title1; 2017 delete title1;
2017 } 2018 }
2018 2019
2019 delete tlist; 2020 delete tlist;
2020 } 2021 }
2022
2021 for (lmsg = first_msg; lmsg; lmsg = nextmsg) 2023 for (lmsg = first_msg; lmsg; lmsg = nextmsg)
2022 { 2024 {
2023 nextmsg = lmsg->next; 2025 nextmsg = lmsg->next;
2024 delete lmsg; 2026 delete lmsg;
2025 } 2027 }
2028
2026 for (monlink = first_mon_info; monlink; monlink = nextmon) 2029 for (monlink = first_mon_info; monlink; monlink = nextmon)
2027 { 2030 {
2028 nextmon = monlink->next; 2031 nextmon = monlink->next;
2029 free (monlink); 2032 free (monlink);
2030 } 2033 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines