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.8 by pippijn, Sat Jan 6 14:42:28 2007 UTC vs.
Revision 1.18 by root, Tue May 6 16:55:25 2008 UTC

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. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22 */
24 23
25#include <global.h> 24#include <global.h>
26 25
27/* 26/*
28 * Add a new friendly object to the linked list of friendly objects. 27 * Add a new friendly object to the linked list of friendly objects.
29 * No checking to see if the object is already in the linked list is done. 28 * No checking to see if the object is already in the linked list is done.
30 */ 29 */
31
32void 30void
33add_friendly_object (object *op) 31add_friendly_object (object *op)
34{ 32{
33 op->flag [FLAG_FRIENDLY] = 1;
34
35 objectlink *ol; 35 objectlink *ol;
36 36
37 /* Add some error checking. This shouldn't happen, but the friendly 37 /* Add some error checking. This shouldn't happen, but the friendly
38 * object list usually isn't very long, and remove_friendly_object 38 * object list usually isn't very long, and remove_friendly_object
39 * won't remove it either. Plus, it is easier to put a breakpoint in 39 * won't remove it either. Plus, it is easier to put a breakpoint in
40 * the debugger here and see where the problem is happening. 40 * the debugger here and see where the problem is happening.
41 */ 41 */
42 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 42 for (ol = first_friendly_object; ol; ol = ol->next)
43 { 43 {
44 if (ol->ob == op) 44 if (ol->ob == op)
45 { 45 {
46 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);
47 return; 47 return;
48 } 48 }
49 } 49 }
50 50
51 ol = first_friendly_object; 51 ol = first_friendly_object;
55} 55}
56 56
57/* 57/*
58 * Removes the specified object from the linked list of friendly objects. 58 * Removes the specified object from the linked list of friendly objects.
59 */ 59 */
60
61void 60void
62remove_friendly_object (object *op) 61remove_friendly_object (object *op)
63{ 62{
64 objectlink *obj; 63 objectlink *obj;
65 64
66 CLEAR_FLAG (op, FLAG_FRIENDLY); 65 CLEAR_FLAG (op, FLAG_FRIENDLY);
67 66
67 if (op->type == GOLEM
68 && op->owner
69 && op->owner->contr
70 && op->owner->contr->golem == op)
71 op->owner->contr->golem = 0;
72
68 if (!first_friendly_object) 73 if (!first_friendly_object)
69 { 74 {
70 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);
71 return; 76 return;
72 } 77 }
78
73 /* if the first object happens to be the one, processing is pretty 79 /* if the first object happens to be the one, processing is pretty
74 * easy. 80 * easy.
75 */ 81 */
76 if (first_friendly_object->ob == op) 82 if (first_friendly_object->ob == op)
77 { 83 {
81 } 87 }
82 else 88 else
83 { 89 {
84 objectlink *prev = first_friendly_object; 90 objectlink *prev = first_friendly_object;
85 91
86 for (obj = first_friendly_object->next; obj != NULL; obj = obj->next) 92 for (obj = first_friendly_object->next; obj; obj = obj->next)
87 { 93 {
88 if (obj->ob == op) 94 if (obj->ob == op)
89 break; 95 break;
96
90 prev = obj; 97 prev = obj;
91 } 98 }
92 99
93 if (obj) 100 if (obj)
94 { 101 {
97 } 104 }
98 } 105 }
99} 106}
100 107
101/* 108/*
102 * Dumps all friendly objects. Invoked in DM-mode with the G key. 109 * Dumps all friendly objects.
103 */ 110 */
104
105void 111void
106dump_friendly_objects (void) 112dump_friendly_objects (void)
107{ 113{
108 objectlink *ol; 114 objectlink *ol;
109 115
110 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 116 for (ol = first_friendly_object; ol; ol = ol->next)
111 LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count); 117 LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count);
112} 118}
113 119
114/* New function, MSW 2000-1-14 120/* New function, MSW 2000-1-14
115 * It traverses the friendly list removing objects that should not be here 121 * It traverses the friendly list removing objects that should not be here
149int 155int
150is_friendly (const object *op) 156is_friendly (const object *op)
151{ 157{
152 objectlink *ol; 158 objectlink *ol;
153 159
154 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 160 for (ol = first_friendly_object; ol; ol = ol->next)
155 if (ol->ob == op) 161 if (ol->ob == op)
156 return 1; 162 return 1;
157 163
158 return 0; 164 return 0;
159} 165}
166

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines