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.6 by root, Thu Sep 14 22:33:58 2006 UTC vs.
Revision 1.16 by root, Sun Jul 1 05:00:17 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25 25
26/* 26/*
27 * 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.
28 * 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.
29 */ 29 */
30
31void 30void
32add_friendly_object (object *op) 31add_friendly_object (object *op)
33{ 32{
33 op->flag [FLAG_FRIENDLY] = 1;
34
34 objectlink *ol; 35 objectlink *ol;
35 36
36 /* Add some error checking. This shouldn't happen, but the friendly 37 /* Add some error checking. This shouldn't happen, but the friendly
37 * object list usually isn't very long, and remove_friendly_object 38 * object list usually isn't very long, and remove_friendly_object
38 * 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
39 * the debugger here and see where the problem is happening. 40 * the debugger here and see where the problem is happening.
40 */ 41 */
41 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 42 for (ol = first_friendly_object; ol; ol = ol->next)
42 { 43 {
43 if (ol->ob == op) 44 if (ol->ob == op)
44 { 45 {
45 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);
46 return; 47 return;
47 } 48 }
48 } 49 }
49 50
50 ol = first_friendly_object; 51 ol = first_friendly_object;
51 first_friendly_object = get_objectlink (); 52 first_friendly_object = get_objectlink ();
52 first_friendly_object->ob = op; 53 first_friendly_object->ob = op;
53 first_friendly_object->id = op->count;
54 first_friendly_object->next = ol; 54 first_friendly_object->next = ol;
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 {
78 obj = first_friendly_object; 84 obj = first_friendly_object;
79 first_friendly_object = obj->next; 85 first_friendly_object = obj->next;
80 free (obj); 86 delete obj;
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 }
99
92 if (obj) 100 if (obj)
93 { 101 {
94 /* This should not happen. But if it does, presumably the
95 * call to remove it is still valid.
96 */
97 if (obj->id != op->count)
98 {
99 LOG (llevError, "remove_friendly_object, tags do no match, %s, %d != %d\n",
100 op->name ? (const char *) op->name : "none", op->count, obj->id);
101 }
102 prev->next = obj->next; 102 prev->next = obj->next;
103 free (obj); 103 delete obj;
104 } 104 }
105 } 105 }
106} 106}
107 107
108/* 108/*
109 * Dumps all friendly objects. Invoked in DM-mode with the G key. 109 * Dumps all friendly objects.
110 */ 110 */
111
112void 111void
113dump_friendly_objects (void) 112dump_friendly_objects (void)
114{ 113{
115 objectlink *ol; 114 objectlink *ol;
116 115
117 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 116 for (ol = first_friendly_object; ol; ol = ol->next)
118 LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count); 117 LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count);
119} 118}
120 119
121/* New function, MSW 2000-1-14 120/* New function, MSW 2000-1-14
122 * 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
… …
126clean_friendly_list (void) 125clean_friendly_list (void)
127{ 126{
128 objectlink *obj, *prev = NULL, *next; 127 objectlink *obj, *prev = NULL, *next;
129 int count = 0; 128 int count = 0;
130 129
131 for (obj = first_friendly_object; obj != NULL; obj = next) 130 for (obj = first_friendly_object; obj; obj = next)
132 { 131 {
133 next = obj->next; 132 next = obj->next;
134 if (QUERY_FLAG (obj->ob, FLAG_FREED) || !QUERY_FLAG (obj->ob, FLAG_FRIENDLY) || (obj->id != obj->ob->count)) 133 if (QUERY_FLAG (obj->ob, FLAG_FREED) || !QUERY_FLAG (obj->ob, FLAG_FRIENDLY))
135 { 134 {
136 if (prev) 135 if (prev)
137 {
138 prev->next = obj->next; 136 prev->next = obj->next;
139 }
140 else 137 else
141 {
142 first_friendly_object = obj->next; 138 first_friendly_object = obj->next;
143 } 139
144 count++; 140 count++;
145 free (obj); 141 delete obj;
146 } 142 }
147 /* If we removed the object, then prev is still valid. */
148 else 143 else
144 /* If we removed the object, then prev is still valid. */
149 prev = obj; 145 prev = obj;
150 } 146 }
147
151 if (count) 148 if (count)
152 LOG (llevDebug, "clean_friendly_list: Removed %d bogus links\n", count); 149 LOG (llevDebug, "clean_friendly_list: Removed %d bogus links\n", count);
153} 150}
154 151
155/* Checks if the given object is already in the friendly list or not 152/* Checks if the given object is already in the friendly list or not
… …
158int 155int
159is_friendly (const object *op) 156is_friendly (const object *op)
160{ 157{
161 objectlink *ol; 158 objectlink *ol;
162 159
163 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 160 for (ol = first_friendly_object; ol; ol = ol->next)
164 if (ol->ob == op) 161 if (ol->ob == op)
165 return 1; 162 return 1;
166 163
167 return 0; 164 return 0;
168} 165}
166

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines