--- deliantra/server/common/loader.C	2007/01/06 14:42:29	1.40
+++ deliantra/server/common/loader.C	2007/01/08 12:44:34	1.43
@@ -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;
@@ -907,6 +908,7 @@
           case KW_one_hit:              GET_FLAG (op, FLAG_ONE_HIT); break;
           case KW_berserk:              GET_FLAG (op, FLAG_BERSERK); break;
           case KW_is_buildable:         GET_FLAG (op, FLAG_IS_BUILDABLE); break;
+          case KW_destroy_on_death:     GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
 
           case KW_armour:               thawer.get (op->resist[ATNR_PHYSICAL]); break;
           case KW_resist_physical:      thawer.get (op->resist[ATNR_PHYSICAL]); break;
@@ -1267,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,
@@ -1276,6 +1278,7 @@
     KW_NULL,
     KW_is_buildable,
     /* 110 */
+    KW_destroy_on_death,
   };
 
   int i;