--- deliantra/server/include/libproto.h 2009/01/11 06:08:40 1.72 +++ deliantra/server/include/libproto.h 2009/10/15 20:45:01 1.75 @@ -5,18 +5,19 @@ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team * Copyright (©) 1992,2007 Frank Tore Johansen * - * Deliantra is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Deliantra is free software: you can redistribute it and/or modify it under + * the terms of the Affero GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the Affero GNU General Public License + * and the GNU General Public License along with this program. If not, see + * . * * The authors can be reached via e-mail to */ @@ -55,10 +56,10 @@ extern void update_button (object *op, object *originator); extern void use_trigger (object *op, object *originator); extern void animate_turning (object *op); -extern int check_altar_sacrifice (const object *altar, const object *sacrifice); -extern int operate_altar (object *altar, object **sacrifice); +extern int check_altar_sacrifice (object *altar, object *sacrifice, object *originator = 0); +extern int operate_altar (object *altar, object **sacrifice, object *originator = 0); extern void trigger_move (object *op, int state, object *originator); -extern int check_trigger (object *op, object *cause); +extern int check_trigger (object *op, object *cause, object *originator = 0); extern int get_button_value (const object *button); extern void do_mood_floor (object *op, object *source = 0); extern object *check_inv_recursive (object *op, const object *trig); @@ -209,20 +210,8 @@ extern int quest_on_activate (object *ob, player *pl); extern int quest_is_override_compatible (const object *marker, const object *pl); /* readable.c */ -extern int nstrtok (const char *buf1, const char *buf2); -extern char *strtoktolin (const char *buf1, const char *buf2); -extern int book_overflow (const char *buf1, const char *buf2, int booksize); extern void init_readable (); -extern void change_book (object *book, int msgtype); extern object *get_random_mon (int level); -extern char *mon_desc (const object *mon); -extern object *get_next_mon (object *tmp); -extern char *mon_info_msg (int level, int booksize); -extern const char *artifact_msg (int level, int booksize); -extern char *spellpath_msg (int level, int booksize); -extern void make_formula_book (object *book, int level); -extern char *msgfile_msg (int level, int booksize); -extern const char *god_info_msg (int level, int booksize); extern void tailor_readable_ob (object *book, int msg_type); extern void free_all_readable (); extern void write_book_archive ();