--- deliantra/server/common/friend.C 2008/05/06 16:55:25 1.18 +++ deliantra/server/common/friend.C 2009/11/06 13:03:34 1.21 @@ -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 */ @@ -105,18 +106,6 @@ } } -/* - * Dumps all friendly objects. - */ -void -dump_friendly_objects (void) -{ - objectlink *ol; - - for (ol = first_friendly_object; ol; ol = ol->next) - LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count); -} - /* New function, MSW 2000-1-14 * It traverses the friendly list removing objects that should not be here * (ie, do not have friendly flag set, freed, etc) @@ -152,12 +141,10 @@ /* Checks if the given object is already in the friendly list or not * Lauwenmark - 31/07/05 */ -int +static int is_friendly (const object *op) { - objectlink *ol; - - for (ol = first_friendly_object; ol; ol = ol->next) + for (objectlink *ol = first_friendly_object; ol; ol = ol->next) if (ol->ob == op) return 1;