--- deliantra/server/include/cfperl.h 2007/06/24 04:09:29 1.80 +++ deliantra/server/include/cfperl.h 2007/07/21 18:01:26 1.84 @@ -1,23 +1,22 @@ /* - * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. * * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team * Copyright (©) 1992,2007 Frank Tore Johansen * - * Crossfire TRT 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 2 of the License, or (at your option) - * any later version. + * Crossfire TRT 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. * - * 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. + * 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . * * The authors can be reached via e-mail to */ @@ -92,6 +91,7 @@ void cfperl_cleanup (int make_core); void cfperl_make_book (object *book, int level); void cfperl_send_msg (client *ns, int color, const char *type, const char *msg); +int cfperl_can_merge (object *ob1, object *ob2); ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -212,7 +212,8 @@ { } - virtual ~attachable (); + // set a custom key to the given value, or delete it if value = 0 + void set_key (const char *key, const char *value = 0); attachable &operator =(const attachable &src); @@ -233,6 +234,9 @@ // the method that does the real destroy work virtual void do_destroy (); + + // destructor is protected, should not be called by anybody + virtual ~attachable (); }; // the global object is a pseudo object that cares for the global events