--- deliantra/server/common/friend.C	2007/01/06 14:42:28	1.8
+++ deliantra/server/common/friend.C	2012/10/29 23:55:52	1.29
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 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.
-
-    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, 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>
-*/
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * 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>
+ */
 
 #include <global.h>
 
@@ -28,10 +28,11 @@
  * Add a new friendly object to the linked list of friendly objects.
  * No checking to see if the object is already in the linked list is done.
  */
-
 void
 add_friendly_object (object *op)
 {
+  op->flag [FLAG_FRIENDLY] = 1;
+
   objectlink *ol;
 
   /* Add some error checking.  This shouldn't happen, but the friendly
@@ -39,11 +40,11 @@
    * won't remove it either.  Plus, it is easier to put a breakpoint in
    * the debugger here and see where the problem is happening. 
    */
-  for (ol = first_friendly_object; ol != NULL; ol = ol->next)
+  for (ol = first_friendly_object; ol; ol = ol->next)
     {
       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;
         }
     }
@@ -57,19 +58,25 @@
 /*
  * Removes the specified object from the linked list of friendly objects.
  */
-
 void
 remove_friendly_object (object *op)
 {
   objectlink *obj;
 
-  CLEAR_FLAG (op, FLAG_FRIENDLY);
+  op->clr_flag (FLAG_FRIENDLY);
+
+  if (op->type == GOLEM
+      && op->owner
+      && op->owner->contr
+      && op->owner->contr->golem == op)
+    op->owner->contr->golem = 0;
 
   if (!first_friendly_object)
     {
       LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name);
       return;
     }
+
   /* if the first object happens to be the one, processing is pretty
    * easy.
    */
@@ -83,10 +90,11 @@
     {
       objectlink *prev = first_friendly_object;
 
-      for (obj = first_friendly_object->next; obj != NULL; obj = obj->next)
+      for (obj = first_friendly_object->next; obj; obj = obj->next)
         {
           if (obj->ob == op)
             break;
+
           prev = obj;
         }
 
@@ -98,25 +106,12 @@
     }
 }
 
-/*
- * Dumps all friendly objects.  Invoked in DM-mode with the G key.
- */
-
-void
-dump_friendly_objects (void)
-{
-  objectlink *ol;
-
-  for (ol = first_friendly_object; ol != NULL; 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;
@@ -124,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;
@@ -143,17 +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 != NULL; ol = ol->next)
-    if (ol->ob == op)
-      return 1;
-
-  return 0;
-}