--- deliantra/server/common/friend.C 2007/01/15 21:06:18 1.10 +++ deliantra/server/common/friend.C 2007/07/01 05:00:17 1.16 @@ -1,25 +1,24 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * 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 * - * This program is free software; you can redistribute it and/or modify + * 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 + * 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 + * 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, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at + * along with this program. If not, see . + * + * The authors can be reached via e-mail to */ #include @@ -44,7 +43,7 @@ { if (ol->ob == op) { - LOG (llevError, "add_friendly_object: Trying to add object already on list (%s)\n", &op->name); + LOG (llevError | logBacktrace, "add_friendly_object: Trying to add object already on list (%s)\n", &op->name); return; } } @@ -65,6 +64,12 @@ CLEAR_FLAG (op, FLAG_FRIENDLY); + if (op->type == GOLEM + && op->owner + && op->owner->contr + && op->owner->contr->golem == op) + op->owner->contr->golem = 0; + if (!first_friendly_object) { LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name); @@ -88,6 +93,7 @@ { if (obj->ob == op) break; + prev = obj; }