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.9 by root, Mon Jan 8 01:19:02 2007 UTC vs.
Revision 1.11 by root, Tue Apr 24 12:32:14 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License 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
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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 at <crossfire@schmorp.de>
23*/ 23 */
24 24
25#include <global.h> 25#include <global.h>
26 26
27/* 27/*
28 * Add a new friendly object to the linked list of friendly objects. 28 * Add a new friendly object to the linked list of friendly objects.
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->ranges[range_golem] == op)
72 {
73 op->owner->contr->ranges[range_golem] = 0;
74 op->owner->contr->shoottype = range_none;
75 }
76
68 if (!first_friendly_object) 77 if (!first_friendly_object)
69 { 78 {
70 LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name); 79 LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name);
71 return; 80 return;
72 } 81 }
86 95
87 for (obj = first_friendly_object->next; obj; obj = obj->next) 96 for (obj = first_friendly_object->next; obj; obj = obj->next)
88 { 97 {
89 if (obj->ob == op) 98 if (obj->ob == op)
90 break; 99 break;
100
91 prev = obj; 101 prev = obj;
92 } 102 }
93 103
94 if (obj) 104 if (obj)
95 { 105 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines