--- deliantra/server/common/friend.C	2009/10/12 14:00:57	1.20
+++ deliantra/server/common/friend.C	2012/10/29 23:55:52	1.29
@@ -1,24 +1,24 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
- * 
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -63,7 +63,7 @@
 {
   objectlink *obj;
 
-  CLEAR_FLAG (op, FLAG_FRIENDLY);
+  op->clr_flag (FLAG_FRIENDLY);
 
   if (op->type == GOLEM
       && op->owner
@@ -111,7 +111,7 @@
  * (ie, do not have friendly flag set, freed, etc)
  */
 void
-clean_friendly_list (void)
+clean_friendly_list ()
 {
   objectlink *obj, *prev = NULL, *next;
   int count = 0;
@@ -119,7 +119,7 @@
   for (obj = first_friendly_object; obj; obj = next)
     {
       next = obj->next;
-      if (QUERY_FLAG (obj->ob, FLAG_FREED) || !QUERY_FLAG (obj->ob, FLAG_FRIENDLY))
+      if (obj->ob->flag [FLAG_FREED] || !obj->ob->flag [FLAG_FRIENDLY])
         {
           if (prev)
             prev->next = obj->next;
@@ -138,18 +138,3 @@
     LOG (llevDebug, "clean_friendly_list: Removed %d bogus links\n", count);
 }
 
-/* Checks if the given object is already in the friendly list or not
- * Lauwenmark - 31/07/05
- */
-int
-is_friendly (const object *op)
-{
-  objectlink *ol;
-
-  for (ol = first_friendly_object; ol; ol = ol->next)
-    if (ol->ob == op)
-      return 1;
-
-  return 0;
-}
-