--- deliantra/server/common/friend.C	2007/07/01 05:00:17	1.16
+++ deliantra/server/common/friend.C	2017/01/29 02:47:04	1.31
@@ -1,24 +1,25 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
- * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
- * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
- * it under the terms of the 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 file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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 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 <crossfire@schmorp.de>
+ *
+ * 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>
  */
 
 #include <global.h>
@@ -37,7 +38,7 @@
   /* Add some error checking.  This shouldn't happen, but the friendly
    * object list usually isn't very long, and remove_friendly_object
    * won't remove it either.  Plus, it is easier to put a breakpoint in
-   * the debugger here and see where the problem is happening. 
+   * the debugger here and see where the problem is happening.
    */
   for (ol = first_friendly_object; ol; ol = ol->next)
     {
@@ -62,7 +63,7 @@
 {
   objectlink *obj;
 
-  CLEAR_FLAG (op, FLAG_FRIENDLY);
+  op->clr_flag (FLAG_FRIENDLY);
 
   if (op->type == GOLEM
       && op->owner
@@ -105,24 +106,12 @@
     }
 }
 
-/*
- * Dumps all friendly objects.
- */
-void
-dump_friendly_objects (void)
-{
-  objectlink *ol;
-
-  for (ol = first_friendly_object; ol; ol = ol->next)
-    LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count);
-}
-
 /* New function, MSW 2000-1-14
  * It traverses the friendly list removing objects that should not be here
  * (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;
@@ -130,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;
@@ -149,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;
-}
-