ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/friend.C
(Generate patch)

Comparing deliantra/server/common/friend.C (file contents):
Revision 1.10 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.14 by root, Mon May 28 21:21:40 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26 26
27/* 27/*
63{ 63{
64 objectlink *obj; 64 objectlink *obj;
65 65
66 CLEAR_FLAG (op, FLAG_FRIENDLY); 66 CLEAR_FLAG (op, FLAG_FRIENDLY);
67 67
68 if (op->type == GOLEM
69 && op->owner
70 && op->owner->contr
71 && op->owner->contr->golem == op)
72 op->owner->contr->golem = 0;
73
68 if (!first_friendly_object) 74 if (!first_friendly_object)
69 { 75 {
70 LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name); 76 LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name);
71 return; 77 return;
72 } 78 }
86 92
87 for (obj = first_friendly_object->next; obj; obj = obj->next) 93 for (obj = first_friendly_object->next; obj; obj = obj->next)
88 { 94 {
89 if (obj->ob == op) 95 if (obj->ob == op)
90 break; 96 break;
97
91 prev = obj; 98 prev = obj;
92 } 99 }
93 100
94 if (obj) 101 if (obj)
95 { 102 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines