--- deliantra/server/common/readable.C 2009/10/24 00:43:30 1.50 +++ deliantra/server/common/readable.C 2009/11/06 13:31:47 1.52 @@ -110,11 +110,6 @@ static int nrofmon = 0, need_to_write_bookarchive = 0; - -/* this is needed to keep track of status of initialisation - * of the message file */ -static int nrofmsg = 0; - /* first_msg is the started of the linked list of messages as read from * the messages file */ @@ -123,7 +118,6 @@ /* * Spellpath information */ - static uint32 spellpathdef[NRSPELLPATHS] = { PATH_PROT, PATH_FIRE, @@ -499,7 +493,7 @@ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"}, {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"} }; -int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); +static int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); static int max_titles[6] = { ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)), @@ -621,16 +615,6 @@ return (char *) rbuf; } -static int -book_overflow (const char *buf1, const char *buf2, int booksize) -{ - if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */ - || buf_overflow (buf1, buf2, booksize)) - return 1; - - return 0; -} - /***************************************************************************** * * Start of initialisation related functions. @@ -1817,47 +1801,6 @@ } } -/***************************************************************************** - * - * Cleanup routine for readble stuff. - * - *****************************************************************************/ -void -free_all_readable (void) -{ - titlelist *tlist, *tnext; - title *title1, *titlenext; - linked_char *lmsg, *nextmsg; - objectlink *monlink, *nextmon; - - LOG (llevDebug, "freeing all book information\n"); - - for (tlist = booklist; tlist; tlist = tnext) - { - tnext = tlist->next; - - for (title1 = tlist->first_book; title1; title1 = titlenext) - { - titlenext = title1->next; - delete title1; - } - - delete tlist; - } - - for (lmsg = first_msg; lmsg; lmsg = nextmsg) - { - nextmsg = lmsg->next; - delete lmsg; - } - - for (monlink = first_mon_info; monlink; monlink = nextmon) - { - nextmon = monlink->next; - delete monlink; - } -} - /***************************************************************************** * * Writeback routine for updating the bookarchive.