--- deliantra/server/common/loader.C	2007/01/07 23:10:42	1.41
+++ deliantra/server/common/loader.C	2007/01/08 01:19:02	1.42
@@ -817,10 +817,10 @@
             break;
 
           case KW_friendly:
-            GET_FLAG (op, FLAG_FRIENDLY);
-            //TODO: move to check_object or so
-            if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
-              add_friendly_object (op);
+            if (thawer.get_sint32 ())
+              if (op->type != PLAYER)
+                add_friendly_object (op);
+
             break;
 
           case KW_monster:              GET_FLAG (op, FLAG_MONSTER); break;