--- deliantra/server/common/loader.C	2007/01/07 23:10:42	1.41
+++ deliantra/server/common/loader.C	2007/01/11 01:10:01	1.44
@@ -817,16 +817,17 @@
             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;
           case KW_neutral:              GET_FLAG (op, FLAG_NEUTRAL); break;
           case KW_no_attack:            GET_FLAG (op, FLAG_NO_ATTACK); break;
           case KW_no_damage:            GET_FLAG (op, FLAG_NO_DAMAGE); break;
+          case KW_obj_original:         GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
           case KW_generator:            GET_FLAG (op, FLAG_GENERATOR); break;
           case KW_use_content_on_gen:   GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
           case KW_is_thrown:            GET_FLAG (op, FLAG_IS_THROWN); break;
@@ -1268,7 +1269,7 @@
     /* 100 */
     KW_no_attack,
     KW_no_damage,
-    KW_NULL,
+    KW_obj_original,
     KW_NULL,
     KW_activate_on_push,
     KW_activate_on_release,
@@ -1278,6 +1279,7 @@
     KW_is_buildable,
     /* 110 */
     KW_destroy_on_death,
+    KW_NULL,
   };
 
   int i;
@@ -1285,7 +1287,7 @@
   /* This saves the key/value lists.  We do it first so that any
    * keys that match field names will be overwritten by the loader.
    */
-  for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next)
+  for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
     {
       /* Find the field in the opposing member. */
       key_value *arch_field = get_ob_key_link (tmp, my_field->key);