--- deliantra/server/common/friend.C	2010/03/26 01:04:43	1.25
+++ deliantra/server/common/friend.C	2011/04/23 04:56:45	1.27
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  * 
@@ -63,7 +63,7 @@
 {
   objectlink *obj;
 
-  CLEAR_FLAG (op, FLAG_FRIENDLY);
+  op->clr_flag (FLAG_FRIENDLY);
 
   if (op->type == GOLEM
       && op->owner
@@ -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;