--- deliantra/server/common/loader.C	2007/01/03 02:51:09	1.39
+++ deliantra/server/common/loader.C	2007/01/14 23:15:57	1.45
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -631,11 +632,8 @@
                   op->animation_id = 0;
                   CLEAR_FLAG (op, FLAG_ANIMATE);
                 }
-              else
-                {
-                  op->animation_id = find_animation (str);
-                  SET_FLAG (op, FLAG_ANIMATE);
-                }
+              else if ((op->animation_id = find_animation (str)))
+                SET_FLAG (op, FLAG_ANIMATE);
             }
 
             break;
@@ -816,16 +814,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;
@@ -906,6 +905,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;
@@ -1266,7 +1266,7 @@
     /* 100 */
     KW_no_attack,
     KW_no_damage,
-    KW_NULL,
+    KW_obj_original,
     KW_NULL,
     KW_activate_on_push,
     KW_activate_on_release,
@@ -1275,6 +1275,8 @@
     KW_NULL,
     KW_is_buildable,
     /* 110 */
+    KW_destroy_on_death,
+    KW_NULL,
   };
 
   int i;
@@ -1282,7 +1284,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);