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.23 by root, Sun Nov 29 10:55:18 2009 UTC vs.
Revision 1.28 by root, Tue Jan 3 11:25:30 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
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 op->clr_flag (FLAG_FRIENDLY);
67 67
68 if (op->type == GOLEM 68 if (op->type == GOLEM
69 && op->owner 69 && op->owner
70 && op->owner->contr 70 && op->owner->contr
71 && op->owner->contr->golem == op) 71 && op->owner->contr->golem == op)
117 int count = 0; 117 int count = 0;
118 118
119 for (obj = first_friendly_object; obj; obj = next) 119 for (obj = first_friendly_object; obj; obj = next)
120 { 120 {
121 next = obj->next; 121 next = obj->next;
122 if (QUERY_FLAG (obj->ob, FLAG_FREED) || !QUERY_FLAG (obj->ob, FLAG_FRIENDLY)) 122 if (obj->ob->flag [FLAG_FREED] || !obj->ob->flag [FLAG_FRIENDLY])
123 { 123 {
124 if (prev) 124 if (prev)
125 prev->next = obj->next; 125 prev->next = obj->next;
126 else 126 else
127 first_friendly_object = obj->next; 127 first_friendly_object = obj->next;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines