--- deliantra/server/common/friend.C	2007/04/24 12:32:14	1.11
+++ deliantra/server/common/friend.C	2010/03/26 01:04:43	1.25
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
- * This program 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 2 of the License, or
- * (at your option) any later version.
+ * 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
+ * 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at <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>
@@ -44,7 +44,7 @@
     {
       if (ol->ob == op)
         {
-          LOG (llevError, "add_friendly_object: Trying to add object already on list (%s)\n", &op->name);
+          LOG (llevError | logBacktrace, "add_friendly_object: Trying to add object already on list (%s)\n", &op->name);
           return;
         }
     }
@@ -68,11 +68,8 @@
   if (op->type == GOLEM
       && op->owner
       && op->owner->contr
-      && op->owner->contr->ranges[range_golem] == op)
-    {
-      op->owner->contr->ranges[range_golem] = 0;
-      op->owner->contr->shoottype = range_none;
-    }
+      && op->owner->contr->golem == op)
+    op->owner->contr->golem = 0;
 
   if (!first_friendly_object)
     {
@@ -109,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;
@@ -153,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;
-}
-