--- deliantra/server/common/friend.C	2006/08/29 08:01:35	1.2
+++ deliantra/server/common/friend.C	2006/09/03 00:18:39	1.4
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_friend_c =
- *   "$Id: friend.C,v 1.2 2006/08/29 08:01:35 root Exp $";
+ *   "$Id: friend.C,v 1.4 2006/09/03 00:18:39 root Exp $";
  */
 
 /*
@@ -44,7 +44,7 @@
     for (ol=first_friendly_object; ol!=NULL; ol=ol->next) {
         if (ol->ob == op) {
             LOG(llevError, "add_friendly_object: Trying to add object already on list (%s)\n",
-                op->name);
+                &op->name);
             return;
         }
     }
@@ -66,7 +66,7 @@
     CLEAR_FLAG(op,FLAG_FRIENDLY);
 
     if (!first_friendly_object) {
-        LOG(llevError,"remove_friendly_object called with empty friendly list, remove ob=%s\n", op->name);
+        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
@@ -89,7 +89,7 @@
              */
             if (obj->id != op->count) {
                 LOG(llevError,"remove_friendly_object, tags do no match, %s, %d != %d\n",
-                    op->name?op->name:"none", op->count, obj->id);
+                    op->name?(const char *)op->name:"none", op->count, obj->id);
             }
             prev->next = obj->next;
             free(obj);
@@ -105,7 +105,7 @@
     objectlink *ol;
 
     for(ol=first_friendly_object;ol!=NULL;ol=ol->next)
-        LOG(llevError, "%s (%d)\n",ol->ob->name,ol->ob->count);
+        LOG(llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count);
 }
 
 /* New function, MSW 2000-1-14