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.10 by pippijn, Mon Jan 15 21:06:18 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) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 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
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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 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>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25 26
26/* 27/*
27 * 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.
28 * No checking to see if the object is already in the linked list is done. 29 * No checking to see if the object is already in the linked list is done.
29 */ 30 */
30
31void 31void
32add_friendly_object (object *op) 32add_friendly_object (object *op)
33{ 33{
34 op->flag [FLAG_FRIENDLY] = 1;
35
34 objectlink *ol; 36 objectlink *ol;
35 37
36 /* Add some error checking. This shouldn't happen, but the friendly 38 /* Add some error checking. This shouldn't happen, but the friendly
37 * object list usually isn't very long, and remove_friendly_object 39 * 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 40 * 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. 41 * the debugger here and see where the problem is happening.
40 */ 42 */
41 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 43 for (ol = first_friendly_object; ol; ol = ol->next)
42 { 44 {
43 if (ol->ob == op) 45 if (ol->ob == op)
44 { 46 {
45 LOG (llevError, "add_friendly_object: Trying to add object already on list (%s)\n", &op->name); 47 LOG (llevError, "add_friendly_object: Trying to add object already on list (%s)\n", &op->name);
46 return; 48 return;
48 } 50 }
49 51
50 ol = first_friendly_object; 52 ol = first_friendly_object;
51 first_friendly_object = get_objectlink (); 53 first_friendly_object = get_objectlink ();
52 first_friendly_object->ob = op; 54 first_friendly_object->ob = op;
53 first_friendly_object->id = op->count;
54 first_friendly_object->next = ol; 55 first_friendly_object->next = ol;
55} 56}
56 57
57/* 58/*
58 * Removes the specified object from the linked list of friendly objects. 59 * Removes the specified object from the linked list of friendly objects.
59 */ 60 */
60
61void 61void
62remove_friendly_object (object *op) 62remove_friendly_object (object *op)
63{ 63{
64 objectlink *obj; 64 objectlink *obj;
65 65
68 if (!first_friendly_object) 68 if (!first_friendly_object)
69 { 69 {
70 LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name); 70 LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name);
71 return; 71 return;
72 } 72 }
73
73 /* if the first object happens to be the one, processing is pretty 74 /* if the first object happens to be the one, processing is pretty
74 * easy. 75 * easy.
75 */ 76 */
76 if (first_friendly_object->ob == op) 77 if (first_friendly_object->ob == op)
77 { 78 {
78 obj = first_friendly_object; 79 obj = first_friendly_object;
79 first_friendly_object = obj->next; 80 first_friendly_object = obj->next;
80 free (obj); 81 delete obj;
81 } 82 }
82 else 83 else
83 { 84 {
84 objectlink *prev = first_friendly_object; 85 objectlink *prev = first_friendly_object;
85 86
86 for (obj = first_friendly_object->next; obj != NULL; obj = obj->next) 87 for (obj = first_friendly_object->next; obj; obj = obj->next)
87 { 88 {
88 if (obj->ob == op) 89 if (obj->ob == op)
89 break; 90 break;
90 prev = obj; 91 prev = obj;
91 } 92 }
93
92 if (obj) 94 if (obj)
93 { 95 {
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; 96 prev->next = obj->next;
103 free (obj); 97 delete obj;
104 } 98 }
105 } 99 }
106} 100}
107 101
108/* 102/*
109 * Dumps all friendly objects. Invoked in DM-mode with the G key. 103 * Dumps all friendly objects.
110 */ 104 */
111
112void 105void
113dump_friendly_objects (void) 106dump_friendly_objects (void)
114{ 107{
115 objectlink *ol; 108 objectlink *ol;
116 109
117 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 110 for (ol = first_friendly_object; ol; ol = ol->next)
118 LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count); 111 LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count);
119} 112}
120 113
121/* New function, MSW 2000-1-14 114/* New function, MSW 2000-1-14
122 * It traverses the friendly list removing objects that should not be here 115 * It traverses the friendly list removing objects that should not be here
126clean_friendly_list (void) 119clean_friendly_list (void)
127{ 120{
128 objectlink *obj, *prev = NULL, *next; 121 objectlink *obj, *prev = NULL, *next;
129 int count = 0; 122 int count = 0;
130 123
131 for (obj = first_friendly_object; obj != NULL; obj = next) 124 for (obj = first_friendly_object; obj; obj = next)
132 { 125 {
133 next = obj->next; 126 next = obj->next;
134 if (QUERY_FLAG (obj->ob, FLAG_FREED) || !QUERY_FLAG (obj->ob, FLAG_FRIENDLY) || (obj->id != obj->ob->count)) 127 if (QUERY_FLAG (obj->ob, FLAG_FREED) || !QUERY_FLAG (obj->ob, FLAG_FRIENDLY))
135 { 128 {
136 if (prev) 129 if (prev)
137 {
138 prev->next = obj->next; 130 prev->next = obj->next;
139 }
140 else 131 else
141 {
142 first_friendly_object = obj->next; 132 first_friendly_object = obj->next;
143 } 133
144 count++; 134 count++;
145 free (obj); 135 delete obj;
146 } 136 }
147 /* If we removed the object, then prev is still valid. */
148 else 137 else
138 /* If we removed the object, then prev is still valid. */
149 prev = obj; 139 prev = obj;
150 } 140 }
141
151 if (count) 142 if (count)
152 LOG (llevDebug, "clean_friendly_list: Removed %d bogus links\n", count); 143 LOG (llevDebug, "clean_friendly_list: Removed %d bogus links\n", count);
153} 144}
154 145
155/* Checks if the given object is already in the friendly list or not 146/* Checks if the given object is already in the friendly list or not
158int 149int
159is_friendly (const object *op) 150is_friendly (const object *op)
160{ 151{
161 objectlink *ol; 152 objectlink *ol;
162 153
163 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 154 for (ol = first_friendly_object; ol; ol = ol->next)
164 if (ol->ob == op) 155 if (ol->ob == op)
165 return 1; 156 return 1;
166 157
167 return 0; 158 return 0;
168} 159}
160

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines