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.10 by root, Fri Sep 29 21:55:54 2006 UTC vs.
Revision 1.14 by pippijn, Tue Jan 2 23:39:21 2007 UTC

… …
657 if (did_init_msgfile) 657 if (did_init_msgfile)
658 return; 658 return;
659 did_init_msgfile = 1; 659 did_init_msgfile = 1;
660 660
661 sprintf (fname, "%s/messages", settings.datadir); 661 sprintf (fname, "%s/messages", settings.datadir);
662 LOG (llevDebug, "Reading messages from %s...", fname); 662 LOG (llevDebug, "Reading messages from %s...\n", fname);
663 663
664 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL) 664 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
665 { 665 {
666 linked_char *tmp = NULL; 666 linked_char *tmp = NULL;
667 667
… …
677 if (!strncmp (cp, "ENDMSG", 6)) 677 if (!strncmp (cp, "ENDMSG", 6))
678 { 678 {
679 if (strlen (msgbuf) > BOOK_BUF) 679 if (strlen (msgbuf) > BOOK_BUF)
680 { 680 {
681 LOG (llevDebug, "Warning: this string exceeded max book buf size:"); 681 LOG (llevDebug, "Warning: this string exceeded max book buf size:");
682 LOG (llevDebug, " %s", msgbuf); 682 LOG (llevDebug, " %s\n", msgbuf);
683 } 683 }
684 tmp->name = msgbuf; 684 tmp->name = msgbuf;
685 tmp->next = first_msg; 685 tmp->next = first_msg;
686 first_msg = tmp; 686 first_msg = tmp;
687 nrofmsg++; 687 nrofmsg++;
… …
702 } 702 }
703 close_and_delete (fp, comp); 703 close_and_delete (fp, comp);
704 } 704 }
705 705
706#ifdef BOOK_MSG_DEBUG 706#ifdef BOOK_MSG_DEBUG
707 LOG (llevDebug, "\ninit_info_listfile() got %d messages.\n", nrofmsg); 707 LOG (llevDebug, "init_info_listfile() got %d messages.\n", nrofmsg);
708#endif 708#endif
709 LOG (llevDebug, "done.\n"); 709 LOG (llevDebug, "done.\n");
710} 710}
711 711
712 712
… …
788 book->next = bl->first_book; 788 book->next = bl->first_book;
789 bl->first_book = book; 789 bl->first_book = book;
790 bl->number++; 790 bl->number++;
791 } 791 }
792 } 792 }
793 LOG (llevDebug, " book archives(used/avail): "); 793 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++) 794 for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++)
795 { 795 {
796 LOG (llevDebug, "(%d/%d)", bl->number, max_titles[i]); 796 LOG (llevDebug, "(%d/%d)", bl->number, max_titles[i]);
797 } 797 }
798 LOG (llevDebug, "\n"); 798 LOG (llevDebug, "\n");
… …
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() - initialize linked lists utilized by
… …
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
… …
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;
… …
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;
… …
2027 } 2029 }
2028 2030
2029 for (monlink = first_mon_info; monlink; monlink = nextmon) 2031 for (monlink = first_mon_info; monlink; monlink = nextmon)
2030 { 2032 {
2031 nextmon = monlink->next; 2033 nextmon = monlink->next;
2032 free (monlink); 2034 delete monlink;
2033 } 2035 }
2034} 2036}
2035 2037
2036 2038
2037/***************************************************************************** 2039/*****************************************************************************

Diff Legend

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