--- deliantra/server/common/loader.C	2007/01/07 23:10:42	1.41
+++ deliantra/server/common/loader.C	2007/01/15 21:06:18	1.46
@@ -1,26 +1,26 @@
 /*
-    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
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at <crossfire@schmorp.de>
-*/
+ * 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
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ */
 
 /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
    sub/add_weight will transcend the environment updating the carrying
@@ -632,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;
@@ -817,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;
@@ -1268,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,
@@ -1278,6 +1276,7 @@
     KW_is_buildable,
     /* 110 */
     KW_destroy_on_death,
+    KW_NULL,
   };
 
   int i;
@@ -1285,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);