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.9 by root, Mon Jan 8 01:19:02 2007 UTC

… …
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.
29 * 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.
30 */ 30 */
31
32void 31void
33add_friendly_object (object *op) 32add_friendly_object (object *op)
34{ 33{
34 op->flag [FLAG_FRIENDLY] = 1;
35
35 objectlink *ol; 36 objectlink *ol;
36 37
37 /* Add some error checking. This shouldn't happen, but the friendly 38 /* Add some error checking. This shouldn't happen, but the friendly
38 * object list usually isn't very long, and remove_friendly_object 39 * 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 40 * 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. 41 * the debugger here and see where the problem is happening.
41 */ 42 */
42 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 43 for (ol = first_friendly_object; ol; ol = ol->next)
43 { 44 {
44 if (ol->ob == op) 45 if (ol->ob == op)
45 { 46 {
46 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);
47 return; 48 return;
… …
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 {
… …
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 }
… …
97 } 98 }
98 } 99 }
99} 100}
100 101
101/* 102/*
102 * Dumps all friendly objects. Invoked in DM-mode with the G key. 103 * Dumps all friendly objects.
103 */ 104 */
104
105void 105void
106dump_friendly_objects (void) 106dump_friendly_objects (void)
107{ 107{
108 objectlink *ol; 108 objectlink *ol;
109 109
110 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 110 for (ol = first_friendly_object; ol; ol = ol->next)
111 LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count); 111 LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count);
112} 112}
113 113
114/* New function, MSW 2000-1-14 114/* New function, MSW 2000-1-14
115 * 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
… …
149int 149int
150is_friendly (const object *op) 150is_friendly (const object *op)
151{ 151{
152 objectlink *ol; 152 objectlink *ol;
153 153
154 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 154 for (ol = first_friendly_object; ol; ol = ol->next)
155 if (ol->ob == op) 155 if (ol->ob == op)
156 return 1; 156 return 1;
157 157
158 return 0; 158 return 0;
159} 159}
160

Diff Legend

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