1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 | * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
|
21 | * |
20 | * |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | #include <global.h> |
24 | #include <global.h> |
26 | |
25 | |
27 | /* |
26 | /* |
… | |
… | |
42 | */ |
41 | */ |
43 | for (ol = first_friendly_object; ol; ol = ol->next) |
42 | for (ol = first_friendly_object; ol; ol = ol->next) |
44 | { |
43 | { |
45 | if (ol->ob == op) |
44 | if (ol->ob == op) |
46 | { |
45 | { |
47 | LOG (llevError, "add_friendly_object: Trying to add object already on list (%s)\n", &op->name); |
46 | LOG (llevError | logBacktrace, "add_friendly_object: Trying to add object already on list (%s)\n", &op->name); |
48 | return; |
47 | return; |
49 | } |
48 | } |
50 | } |
49 | } |
51 | |
50 | |
52 | ol = first_friendly_object; |
51 | ol = first_friendly_object; |
… | |
… | |
66 | CLEAR_FLAG (op, FLAG_FRIENDLY); |
65 | CLEAR_FLAG (op, FLAG_FRIENDLY); |
67 | |
66 | |
68 | if (op->type == GOLEM |
67 | if (op->type == GOLEM |
69 | && op->owner |
68 | && op->owner |
70 | && op->owner->contr |
69 | && op->owner->contr |
71 | && op->owner->contr->ranges[range_golem] == op) |
70 | && op->owner->contr->golem == op) |
72 | { |
|
|
73 | op->owner->contr->ranges[range_golem] = 0; |
71 | op->owner->contr->golem = 0; |
74 | op->owner->contr->shoottype = range_none; |
|
|
75 | } |
|
|
76 | |
72 | |
77 | if (!first_friendly_object) |
73 | if (!first_friendly_object) |
78 | { |
74 | { |
79 | LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name); |
75 | LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name); |
80 | return; |
76 | return; |