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.13 by root, Thu May 17 21:32:08 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 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
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 2 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, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 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>
23*/ 23 */
24 24
25#include <global.h> 25#include <global.h>
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
66 CLEAR_FLAG (op, FLAG_FRIENDLY); 66 CLEAR_FLAG (op, FLAG_FRIENDLY);
67 67
68 if (op->type == GOLEM
69 && op->owner
70 && op->owner->contr
71 && op->owner->contr->golem == op)
72 op->owner->contr->golem = 0;
73
68 if (!first_friendly_object) 74 if (!first_friendly_object)
69 { 75 {
70 LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name); 76 LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name);
71 return; 77 return;
72 } 78 }
79
73 /* if the first object happens to be the one, processing is pretty 80 /* if the first object happens to be the one, processing is pretty
74 * easy. 81 * easy.
75 */ 82 */
76 if (first_friendly_object->ob == op) 83 if (first_friendly_object->ob == op)
77 { 84 {
81 } 88 }
82 else 89 else
83 { 90 {
84 objectlink *prev = first_friendly_object; 91 objectlink *prev = first_friendly_object;
85 92
86 for (obj = first_friendly_object->next; obj != NULL; obj = obj->next) 93 for (obj = first_friendly_object->next; obj; obj = obj->next)
87 { 94 {
88 if (obj->ob == op) 95 if (obj->ob == op)
89 break; 96 break;
97
90 prev = obj; 98 prev = obj;
91 } 99 }
92 100
93 if (obj) 101 if (obj)
94 { 102 {
97 } 105 }
98 } 106 }
99} 107}
100 108
101/* 109/*
102 * Dumps all friendly objects. Invoked in DM-mode with the G key. 110 * Dumps all friendly objects.
103 */ 111 */
104
105void 112void
106dump_friendly_objects (void) 113dump_friendly_objects (void)
107{ 114{
108 objectlink *ol; 115 objectlink *ol;
109 116
110 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 117 for (ol = first_friendly_object; ol; ol = ol->next)
111 LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count); 118 LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count);
112} 119}
113 120
114/* New function, MSW 2000-1-14 121/* New function, MSW 2000-1-14
115 * It traverses the friendly list removing objects that should not be here 122 * It traverses the friendly list removing objects that should not be here
149int 156int
150is_friendly (const object *op) 157is_friendly (const object *op)
151{ 158{
152 objectlink *ol; 159 objectlink *ol;
153 160
154 for (ol = first_friendly_object; ol != NULL; ol = ol->next) 161 for (ol = first_friendly_object; ol; ol = ol->next)
155 if (ol->ob == op) 162 if (ol->ob == op)
156 return 1; 163 return 1;
157 164
158 return 0; 165 return 0;
159} 166}
167

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines